Merge "dwc3: gadget: Remove disabling events and ep0 from gadget stop" into msm-4.8
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 1d369eb..32552a5 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1997,6 +1997,10 @@
reset_config(cdev);
if (cdev->driver->disconnect)
cdev->driver->disconnect(cdev);
+ if (cdev->delayed_status != 0) {
+ INFO(cdev, "delayed status mismatch..resetting\n");
+ cdev->delayed_status = 0;
+ }
spin_unlock_irqrestore(&cdev->lock, flags);
}