From f217defb386527bb2c2a954b3b5cfdd3f2689540 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 30 Mar 2019 07:38:33 +0100 Subject: [PATCH] Revert "usb: dwc3-msm: Remove indefinite wakeup" This reverts commit 3f14eeeba3892f2e6075c4e90201c0ff35ca1e8c. Change-Id: I1ab6828643098b1bb182473c867bcaeea8451fbf --- drivers/usb/dwc3/dwc3-msm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c index a75a04a5655f..790ebb19df4a 100644 --- a/drivers/usb/dwc3/dwc3-msm.c +++ b/drivers/usb/dwc3/dwc3-msm.c @@ -2175,6 +2175,8 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool hibernation) dev_dbg(mdwc->dev, "defer suspend with %d(msecs)\n", mdwc->lpm_to_suspend_delay); pm_wakeup_event(mdwc->dev, mdwc->lpm_to_suspend_delay); + } else { + pm_relax(mdwc->dev); } atomic_set(&dwc->in_lpm, 1); @@ -2216,6 +2218,8 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc) return 0; } + pm_stay_awake(mdwc->dev); + /* Enable bus voting */ if (mdwc->bus_perf_client) { mdwc->bus_vote = 1;