diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-19 20:37:35 +0100 |
| commit | 134933e55789ece9bca973d3502c7b8f7a9dae86 (patch) | |
| tree | b1694310855e43acb5fceb8b2d55ec8cd713ccad /drivers/usb/host/xhci.c | |
| parent | 24868367cdcac447232ebcb2aa06e1bf91291586 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
| download | linux-134933e55789ece9bca973d3502c7b8f7a9dae86.tar.bz2 | |
Merge tag 'v4.16-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 25d4b748a56f..5d37700ae4b0 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -877,6 +877,9 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags); del_timer_sync(&xhci->shared_hcd->rh_timer); + if (xhci->quirks & XHCI_SUSPEND_DELAY) + usleep_range(1000, 1500); + spin_lock_irq(&xhci->lock); clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags); |