summaryrefslogtreecommitdiff
path: root/drivers/usb/renesas_usbhs/mod_gadget.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-08-15 18:54:13 +0300
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-08-15 18:54:13 +0300
commit55cfcd12115419810972f62741df19ca98c575a3 (patch)
treeeb9b6e6666c2791e7af030f3f4bf47fcce615454 /drivers/usb/renesas_usbhs/mod_gadget.c
parent35bdb0979555e2fca39a5b0302d1b0c4b17d81e6 (diff)
parent75e8c48b9ef30bfda38e7f6e5d807352fbf0b090 (diff)
downloadlinux-55cfcd12115419810972f62741df19ca98c575a3.tar.xz
Merge branch 'open_state'
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod_gadget.c')
-rw-r--r--drivers/usb/renesas_usbhs/mod_gadget.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 93fba9033b00..2c8161bcf5b5 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -639,14 +639,11 @@ static int usbhsg_ep_disable(struct usb_ep *ep)
struct usbhsg_uep *uep = usbhsg_ep_to_uep(ep);
struct usbhs_pipe *pipe;
unsigned long flags;
- int ret = 0;
spin_lock_irqsave(&uep->lock, flags);
pipe = usbhsg_uep_to_pipe(uep);
- if (!pipe) {
- ret = -EINVAL;
+ if (!pipe)
goto out;
- }
usbhsg_pipe_disable(uep);
usbhs_pipe_free(pipe);