diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-23 08:39:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-23 08:39:04 -0700 |
| commit | d448d5bf1ade7ed65becdcb73fed3ecdf379fa72 (patch) | |
| tree | 9b6c8b4b552afd9d414848f9deec83ac80c83a00 | |
| parent | c7e9684caf25f542179461d58d4de127cd809d1c (diff) | |
| parent | 358afa57426ff712993e186fc40583f7ae6dcd49 (diff) | |
Merge "dwc3-msm: Replace autosuspend delay functionality with stop host mode"
| -rw-r--r-- | drivers/usb/dwc3/dwc3-msm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c index de31a6000390..4a5f3ec67785 100644 --- a/drivers/usb/dwc3/dwc3-msm.c +++ b/drivers/usb/dwc3/dwc3-msm.c @@ -2229,7 +2229,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool hibernation) /* kick_sm if it is waiting for lpm sequence to finish */ if (test_and_clear_bit(WAIT_FOR_LPM, &mdwc->inputs)) - schedule_delayed_work(&mdwc->sm_work, 0); + queue_delayed_work(mdwc->sm_usb_wq, &mdwc->sm_work, 0); mutex_unlock(&mdwc->suspend_resume_mutex); @@ -3748,8 +3748,7 @@ static int dwc3_otg_start_host(struct dwc3_msm *mdwc, int on) /* wait for LPM, to ensure h/w is reset after stop_host */ set_bit(WAIT_FOR_LPM, &mdwc->inputs); - pm_runtime_mark_last_busy(mdwc->dev); - pm_runtime_put_sync_autosuspend(mdwc->dev); + pm_runtime_put_sync_suspend(mdwc->dev); dbg_event(0xFF, "StopHost psync", atomic_read(&mdwc->dev->power.usage_count)); } |