From 86031f1f922f7cf293693334619358f4c63d3ab8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 31 Oct 2011 00:48:46 -0700 Subject: [PATCH] --- yaml --- r: 280873 b: refs/heads/master c: 3eddc9e4c828dbbeabb5924266bfded42a1ac042 h: refs/heads/master i: 280871: 76f1e06a3e3568424c2b7952f598634e4d3f51d8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/renesas_usbhs/mod_host.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 68bb5f8a40c5..e0893c5d3d6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f352741d2704a480a927160be8c910570bf51238 +refs/heads/master: 3eddc9e4c828dbbeabb5924266bfded42a1ac042 diff --git a/trunk/drivers/usb/renesas_usbhs/mod_host.c b/trunk/drivers/usb/renesas_usbhs/mod_host.c index e09b64a92a4e..887cf686bca9 100644 --- a/trunk/drivers/usb/renesas_usbhs/mod_host.c +++ b/trunk/drivers/usb/renesas_usbhs/mod_host.c @@ -500,11 +500,12 @@ static void usbhsh_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt) } static int usbhsh_queue_push(struct usb_hcd *hcd, - struct usbhs_pipe *pipe, struct urb *urb, gfp_t mem_flags) { struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd); + struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep); + struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep); struct device *dev = usbhsh_hcd_to_dev(hcd); struct usbhsh_request *ureq; void *buf; @@ -666,11 +667,12 @@ static int usbhsh_status_stage_packet_push(struct usbhsh_hpriv *hpriv, } static int usbhsh_dcp_queue_push(struct usb_hcd *hcd, - struct usbhs_pipe *pipe, struct urb *urb, gfp_t mflags) { struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd); + struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep); + struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep); struct device *dev = usbhsh_hcd_to_dev(hcd); int ret; @@ -743,7 +745,6 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd, struct usb_device *usbv = usbhsh_urb_to_usbv(urb); struct usb_host_endpoint *ep = urb->ep; struct usbhsh_device *udev, *new_udev = NULL; - struct usbhs_pipe *pipe; struct usbhsh_ep *uep; int is_dir_in = usb_pipein(urb->pipe); @@ -777,15 +778,14 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd, if (!uep) goto usbhsh_urb_enqueue_error_free_device; } - pipe = usbhsh_uep_to_pipe(uep); /* * push packet */ if (usb_pipecontrol(urb->pipe)) - ret = usbhsh_dcp_queue_push(hcd, pipe, urb, mem_flags); + ret = usbhsh_dcp_queue_push(hcd, urb, mem_flags); else - ret = usbhsh_queue_push(hcd, pipe, urb, mem_flags); + ret = usbhsh_queue_push(hcd, urb, mem_flags); return ret;