Merge "usb: gadget: Prevent race between composite_setup & USB disconnect" (2b4f008e) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/dwc3/gadget.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2320,6 +2320,11 @@ static int dwc3_gadget_vbus_session(struct usb_gadget *_gadget, int is_active)
		is_active = !!is_active;

		dbg_event(0xFF, "VbusSess", is_active);

		disable_irq(dwc->irq);

		flush_work(&dwc->bh_work);

		spin_lock_irqsave(&dwc->lock, flags);

		/* Mark that the vbus was powered */
		@@ -2351,6 +2356,8 @@ static int dwc3_gadget_vbus_session(struct usb_gadget *_gadget, int is_active)
		}

		spin_unlock_irqrestore(&dwc->lock, flags);

		enable_irq(dwc->irq);
		return 0;
		}