From 074b871fb15812c889d75ddc04b8f5ede53fd086 Mon Sep 17 00:00:00 2001 From: Sriharsha Allenki Date: Wed, 22 Nov 2017 17:12:11 +0530 Subject: [PATCH] usb: gadget: Fix crash on calling usb gadget activate/deactivate Currently the functions usb_gadget_activate and usb_gadget_deactivate are being called with spinlock held. The above functions calls gadget_pullup which invokes pm_runtime_get_sync call, which might sleep. This results in a crash. Fix this by releasing the spinlock and acquiring it after the function call. Change-Id: I17359e3c3227773a8ce269f8db93bc1d56771044 Signed-off-by: Sriharsha Allenki --- drivers/usb/gadget/composite.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a6b281d2ce43..9d511d8bc039 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -392,8 +392,11 @@ int usb_function_deactivate(struct usb_function *function) spin_lock_irqsave(&cdev->lock, flags); - if (cdev->deactivations == 0) + if (cdev->deactivations == 0) { + spin_unlock_irqrestore(&cdev->lock, flags); status = usb_gadget_deactivate(cdev->gadget); + spin_lock_irqsave(&cdev->lock, flags); + } if (status == 0) cdev->deactivations++; @@ -424,8 +427,11 @@ int usb_function_activate(struct usb_function *function) status = -EINVAL; else { cdev->deactivations--; - if (cdev->deactivations == 0) + if (cdev->deactivations == 0) { + spin_unlock_irqrestore(&cdev->lock, flags); status = usb_gadget_activate(cdev->gadget); + spin_lock_irqsave(&cdev->lock, flags); + } } spin_unlock_irqrestore(&cdev->lock, flags);