On Fri, Oct 17, 2014 at 07:05:19PM +0000, Paul Zimmerman wrote: > > From: Felipe Balbi [mailto:balbi@xxxxxx] > > Sent: Friday, October 17, 2014 11:52 AM > > > > On Fri, Oct 17, 2014 at 06:50:19PM +0000, Paul Zimmerman wrote: > > > > From: Sudip Mukherjee [mailto:sudipm.mukherjee@xxxxxxxxx] > > > > Sent: Thursday, October 16, 2014 9:44 PM > > > > > > > > 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. > > > > > > > > Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx> > > > > --- > > > > drivers/usb/dwc2/gadget.c | 7 +++++-- > > > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c > > > > index 7b5856f..7f25527 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; > > > > } > > > > > > Acked-by: Paul Zimmerman <paulz@xxxxxxxxxxxx> > > > > v3.18-rc or v3.19 ? > > v3.18-rc, since it's a bugfix. And I forgot, this should be marked for > 3.17 stable too. Alright, I'll add that. -- balbi
Attachment:
signature.asc
Description: Digital signature
