.. | .. |
---|
120 | 120 | /* No current DMA ongoing */ |
---|
121 | 121 | req->active = false; |
---|
122 | 122 | |
---|
123 | | - /* Grab lenght out of HW */ |
---|
| 123 | + /* Grab length out of HW */ |
---|
124 | 124 | len = VHUB_EP_DMA_TX_SIZE(stat); |
---|
125 | 125 | |
---|
126 | 126 | /* If not using DMA, copy data out if needed */ |
---|
.. | .. |
---|
352 | 352 | |
---|
353 | 353 | /* Endpoint enabled ? */ |
---|
354 | 354 | if (!ep->epn.enabled || !u_ep->desc || !ep->dev || !ep->d_idx || |
---|
355 | | - !ep->dev->enabled || ep->dev->suspended) { |
---|
356 | | - EPDBG(ep,"Enqueing request on wrong or disabled EP\n"); |
---|
| 355 | + !ep->dev->enabled) { |
---|
| 356 | + EPDBG(ep, "Enqueuing request on wrong or disabled EP\n"); |
---|
357 | 357 | return -ESHUTDOWN; |
---|
358 | 358 | } |
---|
359 | 359 | |
---|
.. | .. |
---|
596 | 596 | static int ast_vhub_epn_enable(struct usb_ep* u_ep, |
---|
597 | 597 | const struct usb_endpoint_descriptor *desc) |
---|
598 | 598 | { |
---|
599 | | - static const char *ep_type_string[] __maybe_unused = { "ctrl", |
---|
600 | | - "isoc", |
---|
601 | | - "bulk", |
---|
602 | | - "intr" }; |
---|
603 | 599 | struct ast_vhub_ep *ep = to_ast_ep(u_ep); |
---|
604 | 600 | struct ast_vhub_dev *dev; |
---|
605 | 601 | struct ast_vhub *vhub; |
---|
.. | .. |
---|
649 | 645 | ep->epn.wedged = false; |
---|
650 | 646 | |
---|
651 | 647 | EPDBG(ep, "Enabling [%s] %s num %d maxpacket=%d\n", |
---|
652 | | - ep->epn.is_in ? "in" : "out", ep_type_string[type], |
---|
| 648 | + ep->epn.is_in ? "in" : "out", usb_ep_type_string(type), |
---|
653 | 649 | usb_endpoint_num(desc), maxpacket); |
---|
654 | 650 | |
---|
655 | 651 | /* Can we use DMA descriptor mode ? */ |
---|
.. | .. |
---|
807 | 803 | |
---|
808 | 804 | /* Find a free one (no device) */ |
---|
809 | 805 | spin_lock_irqsave(&vhub->lock, flags); |
---|
810 | | - for (i = 0; i < AST_VHUB_NUM_GEN_EPs; i++) |
---|
| 806 | + for (i = 0; i < vhub->max_epns; i++) |
---|
811 | 807 | if (vhub->epns[i].dev == NULL) |
---|
812 | 808 | break; |
---|
813 | | - if (i >= AST_VHUB_NUM_GEN_EPs) { |
---|
| 809 | + if (i >= vhub->max_epns) { |
---|
814 | 810 | spin_unlock_irqrestore(&vhub->lock, flags); |
---|
815 | 811 | return NULL; |
---|
816 | 812 | } |
---|