Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5f7d651 authored by Sriharsha Allenki's avatar Sriharsha Allenki Committed by Hemant Kumar
Browse files

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: default avatarSriharsha Allenki <sallenki@codeaurora.org>
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
parent d457f332

drivers/usb/gadget/composite.c

+8 −2
Original line number Diff line number Diff line
@@ -349,8 +349,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++;
@@ -381,8 +384,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);