Merge "usb: gadget: Fix crash on calling usb gadget activate/deactivate" (9d40b50f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/gadget/composite.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -363,8 +363,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++;

		@@ -395,8 +398,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);