aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/renesas_usbhs/mod_host.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c
index e09b64a92a4e..887cf686bca9 100644
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@ -500,11 +500,12 @@ static void usbhsh_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt)
500} 500}
501 501
502static int usbhsh_queue_push(struct usb_hcd *hcd, 502static int usbhsh_queue_push(struct usb_hcd *hcd,
503 struct usbhs_pipe *pipe,
504 struct urb *urb, 503 struct urb *urb,
505 gfp_t mem_flags) 504 gfp_t mem_flags)
506{ 505{
507 struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd); 506 struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd);
507 struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep);
508 struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep);
508 struct device *dev = usbhsh_hcd_to_dev(hcd); 509 struct device *dev = usbhsh_hcd_to_dev(hcd);
509 struct usbhsh_request *ureq; 510 struct usbhsh_request *ureq;
510 void *buf; 511 void *buf;
@@ -666,11 +667,12 @@ static int usbhsh_status_stage_packet_push(struct usbhsh_hpriv *hpriv,
666} 667}
667 668
668static int usbhsh_dcp_queue_push(struct usb_hcd *hcd, 669static int usbhsh_dcp_queue_push(struct usb_hcd *hcd,
669 struct usbhs_pipe *pipe,
670 struct urb *urb, 670 struct urb *urb,
671 gfp_t mflags) 671 gfp_t mflags)
672{ 672{
673 struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd); 673 struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd);
674 struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep);
675 struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep);
674 struct device *dev = usbhsh_hcd_to_dev(hcd); 676 struct device *dev = usbhsh_hcd_to_dev(hcd);
675 int ret; 677 int ret;
676 678
@@ -743,7 +745,6 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
743 struct usb_device *usbv = usbhsh_urb_to_usbv(urb); 745 struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
744 struct usb_host_endpoint *ep = urb->ep; 746 struct usb_host_endpoint *ep = urb->ep;
745 struct usbhsh_device *udev, *new_udev = NULL; 747 struct usbhsh_device *udev, *new_udev = NULL;
746 struct usbhs_pipe *pipe;
747 struct usbhsh_ep *uep; 748 struct usbhsh_ep *uep;
748 int is_dir_in = usb_pipein(urb->pipe); 749 int is_dir_in = usb_pipein(urb->pipe);
749 750
@@ -777,15 +778,14 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
777 if (!uep) 778 if (!uep)
778 goto usbhsh_urb_enqueue_error_free_device; 779 goto usbhsh_urb_enqueue_error_free_device;
779 } 780 }
780 pipe = usbhsh_uep_to_pipe(uep);
781 781
782 /* 782 /*
783 * push packet 783 * push packet
784 */ 784 */
785 if (usb_pipecontrol(urb->pipe)) 785 if (usb_pipecontrol(urb->pipe))
786 ret = usbhsh_dcp_queue_push(hcd, pipe, urb, mem_flags); 786 ret = usbhsh_dcp_queue_push(hcd, urb, mem_flags);
787 else 787 else
788 ret = usbhsh_queue_push(hcd, pipe, urb, mem_flags); 788 ret = usbhsh_queue_push(hcd, urb, mem_flags);
789 789
790 return ret; 790 return ret;
791 791