diff options
Diffstat (limited to 'drivers/usb/host/fhci-sched.c')
-rw-r--r-- | drivers/usb/host/fhci-sched.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 3d12cdd5f999..3235d5307403 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c | |||
@@ -727,8 +727,7 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) | |||
727 | } | 727 | } |
728 | ed->speed = (urb->dev->speed == USB_SPEED_LOW) ? | 728 | ed->speed = (urb->dev->speed == USB_SPEED_LOW) ? |
729 | FHCI_LOW_SPEED : FHCI_FULL_SPEED; | 729 | FHCI_LOW_SPEED : FHCI_FULL_SPEED; |
730 | ed->max_pkt_size = usb_maxpacket(urb->dev, | 730 | ed->max_pkt_size = usb_endpoint_maxp(&urb->ep->desc); |
731 | urb->pipe, usb_pipeout(urb->pipe)); | ||
732 | urb->ep->hcpriv = ed; | 731 | urb->ep->hcpriv = ed; |
733 | fhci_dbg(fhci, "new ep speed=%d max_pkt_size=%d\n", | 732 | fhci_dbg(fhci, "new ep speed=%d max_pkt_size=%d\n", |
734 | ed->speed, ed->max_pkt_size); | 733 | ed->speed, ed->max_pkt_size); |
@@ -768,8 +767,7 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) | |||
768 | if (urb->transfer_flags & URB_ZERO_PACKET && | 767 | if (urb->transfer_flags & URB_ZERO_PACKET && |
769 | urb->transfer_buffer_length > 0 && | 768 | urb->transfer_buffer_length > 0 && |
770 | ((urb->transfer_buffer_length % | 769 | ((urb->transfer_buffer_length % |
771 | usb_maxpacket(urb->dev, urb->pipe, | 770 | usb_endpoint_maxp(&urb->ep->desc)) == 0)) |
772 | usb_pipeout(urb->pipe))) == 0)) | ||
773 | urb_state = US_BULK0; | 771 | urb_state = US_BULK0; |
774 | while (data_len > 4096) { | 772 | while (data_len > 4096) { |
775 | td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt, | 773 | td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt, |
@@ -807,8 +805,8 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) | |||
807 | break; | 805 | break; |
808 | case FHCI_TF_CTRL: | 806 | case FHCI_TF_CTRL: |
809 | ed->dev_addr = usb_pipedevice(urb->pipe); | 807 | ed->dev_addr = usb_pipedevice(urb->pipe); |
810 | ed->max_pkt_size = usb_maxpacket(urb->dev, urb->pipe, | 808 | ed->max_pkt_size = usb_endpoint_maxp(&urb->ep->desc); |
811 | usb_pipeout(urb->pipe)); | 809 | |
812 | /* setup stage */ | 810 | /* setup stage */ |
813 | td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP, | 811 | td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, FHCI_TA_SETUP, |
814 | USB_TD_TOGGLE_DATA0, urb->setup_packet, 8, 0, 0, true); | 812 | USB_TD_TOGGLE_DATA0, urb->setup_packet, 8, 0, 0, true); |