diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2015-04-07 11:17:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2015-04-07 11:17:34 +0200 |
| commit | b7a4abb67416aa07cd65446dd39e64525ccfe8e5 (patch) | |
| tree | 8f5b0f9ffb617622944b5e6368473f91e3efeaa4 /drivers/usb/isp1760 | |
| parent | usb: musb: dsps: fix build on i386 when COMPILE_TEST is set (diff) | |
| parent | Linux 4.0-rc7 (diff) | |
| download | linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.tar.gz linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.tar.bz2 linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.zip | |
Merge 4.0-rc7 into usb-next
We want the fixes in here, and to help resolve merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/isp1760')
| -rw-r--r-- | drivers/usb/isp1760/isp1760-udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c index f32c292cc868..3fc4fe770253 100644 --- a/drivers/usb/isp1760/isp1760-udc.c +++ b/drivers/usb/isp1760/isp1760-udc.c @@ -1203,7 +1203,7 @@ static int isp1760_udc_start(struct usb_gadget *gadget, if (udc->driver) { dev_err(udc->isp->dev, "UDC already has a gadget driver\n"); - spin_unlock(&udc->lock); + spin_unlock_irqrestore(&udc->lock, flags); return -EBUSY; } |