From ebb7b1b88835ad3bfb2eaeebb1336a2c7fe67ae5 Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Thu, 12 Oct 2023 09:58:58 +0800 Subject: [PATCH] usb: dwc3: fix failed to reset device for otg host after PM resume With upstream commit 649f5c842ba3 ("usb: dwc3: core: Host wake up support from system suspend"), if the device set to wakeup capable, dwc3_resume_common() will skip core init that would be caused the device reset failed after PM resume time. The above upstream changes also delete the wake up flag set in dwc3_runtime_suspend()/dwc3_runtime_resume(), so keep in line with it. Change-Id: If5f06c0d19e123cf907f0fc3294a6ba708a8fd35 Signed-off-by: Frank Wang --- drivers/usb/dwc3/core.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index b11e3073ebb9..b624ff430b05 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -2223,8 +2223,6 @@ static int dwc3_runtime_suspend(struct device *dev) if (ret) return ret; - device_init_wakeup(dev, false); - return 0; } @@ -2233,8 +2231,6 @@ static int dwc3_runtime_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; - device_init_wakeup(dev, true); - ret = dwc3_resume_common(dwc, PMSG_AUTO_RESUME); if (ret) return ret;