Revert "usb/dwc2: Set correct state on gadget disconnect"

This reverts commit c397485. See: #3885 Signed-off-by: Phil Elwell <[email protected]>
raspberrypi · Nov 4, 2020 · fda5788 · fda5788
1 parent a787b86
commit fda5788
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
@@ -533,11 +533,14 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
 						__func__);
 			}
 skip_power_saving:
-			/* Raspberry Pi seems to call the suspend interrupt on gadget disconnect, so instead of setting state to suspend set to not attached */
-
-			hsotg->lx_state = DWC2_L3;
+			/*
+			 * Change to L2 (suspend) state before releasing
+			 * spinlock
+			 */
+			hsotg->lx_state = DWC2_L2;
 
-			usb_gadget_set_state(&hsotg->gadget, USB_STATE_NOTATTACHED);
+			/* Call gadget suspend callback */
+			call_gadget(hsotg, suspend);
 		}
 	} else {
 		if (hsotg->op_state == OTG_STATE_A_PERIPHERAL) {