commit 1803cec06da8307c79787c083395f5cfbb6b130f
author Linux Build Service Account <lnxbuild@localhost> Mon Dec 22 05:30:26 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Dec 22 05:30:26 2014 -0800
tree acc4e382f6866a003d5f9787b55616b3e9dcb92a
parent d65b06396ce5e2d8bbe452f2f46500c284410cb7
parent d1394bc781ba15ac8770ca86ebe8529b73e037bf

Merge "usb: dwc3: gadget: Ignore L1 RESUME events"

drivers/usb/dwc3/gadget.c

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 0f86879..c6974cc 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2610,13 +2610,13 @@
 {
 	dev_vdbg(dwc->dev, "%s\n", __func__);
 
-	/*
-	 * TODO take core out of low power mode when that's
-	 * implemented.
-	 */
+	/* Only perform resume from L2 or Early suspend states */
+	if (dwc->link_state == DWC3_LINK_STATE_U3) {
+		dbg_event(0xFF, "WAKEUP", 0);
+		dwc->gadget_driver->resume(&dwc->gadget);
+	}
 
-	dbg_event(0xFF, "WAKEUP", 0);
-	dwc->gadget_driver->resume(&dwc->gadget);
+	dwc->link_state = DWC3_LINK_STATE_U0;
 }
 
 static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,