summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-24 23:01:58 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-24 23:01:58 +0100
commitbaf7a6c72668c3e981bc2b6b0f58d2f1c2a8aa4e (patch)
treec95cdb2390bebfbe5c752e628664c0f2fc9ffa00
parent227a4fd801c8a9fa2c4700ab98ec1aec06e3b44d (diff)
parent65582a7f4ce5bd7a1fb61516d9c2476f4f166f4e (diff)
downloadop-kernel-dev-baf7a6c72668c3e981bc2b6b0f58d2f1c2a8aa4e.zip
op-kernel-dev-baf7a6c72668c3e981bc2b6b0f58d2f1c2a8aa4e.tar.gz
Merge tag 'fixes-for-v4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes: usb: fix for v4.0-rc6 Here's a single fix to isp1760 calling spin_unlock_irqsave() as we should have. Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/isp1760/isp1760-udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c
index f32c292..3fc4fe7 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;
}
OpenPOWER on IntegriCloud