summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2011-10-19 05:05:50 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-19 22:29:11 +0200
commita2c76b83fdd763c826f38a55127ccf25708099ce (patch)
treeb5a9a59dd1b2e3aa7274a96ace5b44ea82d01679
parentusb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB. (diff)
downloadlinux-a2c76b83fdd763c826f38a55127ccf25708099ce.tar.xz
linux-a2c76b83fdd763c826f38a55127ccf25708099ce.zip
usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
usbhs_pkt_push() had inconsistent return under spin lock. This patch fix it up. Special thanks to Dan Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/renesas_usbhs/fifo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index 762b7429d8bb..8da685e796d1 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -62,14 +62,14 @@ void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
struct device *dev = usbhs_priv_to_dev(priv);
unsigned long flags;
- /******************** spin lock ********************/
- usbhs_lock(priv, flags);
-
if (!done) {
dev_err(dev, "no done function\n");
return;
}
+ /******************** spin lock ********************/
+ usbhs_lock(priv, flags);
+
if (!pipe->handler) {
dev_err(dev, "no handler function\n");
pipe->handler = &usbhsf_null_handler;