diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2014-10-17 06:44:02 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-10-23 16:55:43 +0200 |
| commit | b585a48b8a9486f26a68886278f2c8f981676dd4 (patch) | |
| tree | 90a2aea6cebcbbc5d5eb2ec53018155b3f81747f /drivers/usb | |
| parent | usb: gadget: udc: core: fix kernel oops with soft-connect (diff) | |
| download | linux-b585a48b8a9486f26a68886278f2c8f981676dd4.tar.xz linux-b585a48b8a9486f26a68886278f2c8f981676dd4.zip | |
usb: dwc2: gadget: sparse warning of context imbalance
sparse was giving the following warning:
warning: context imbalance in 's3c_hsotg_ep_enable'
- different lock contexts for basic block
we were returning ENOMEM while still holding the spinlock.
The sparse warning was fixed by releasing the spinlock before return.
Cc: <stable@vger.kernel.org> # v3.17
Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/dwc2/gadget.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 7b5856fadd93..7f25527b10a7 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -2561,8 +2561,10 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, hs_ep->fifo_size = val; break; } - if (i == 8) - return -ENOMEM; + if (i == 8) { + ret = -ENOMEM; + goto error; + } } /* for non control endpoints, set PID to D0 */ @@ -2579,6 +2581,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep, /* enable the endpoint interrupt */ s3c_hsotg_ctrl_epint(hsotg, index, dir_in, 1); +error: spin_unlock_irqrestore(&hsotg->lock, flags); return ret; } |