summaryrefslogtreecommitdiff
path: root/drivers/usb/host/xhci-plat.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-31 12:13:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-31 12:13:10 +0300
commit60c250a98d4ca12a34a89a498cb05d4d221f2f19 (patch)
treef73a2201c64cb9c86fd4d78eac442548bc6df590 /drivers/usb/host/xhci-plat.c
parent993a44fa85c1ea5989fb5c46236ca2e3cfd71b78 (diff)
parent26291c54e111ff6ba87a164d85d4a4e134b7315c (diff)
downloadlinux-60c250a98d4ca12a34a89a498cb05d4d221f2f19.tar.xz
Merge tag 'v5.17-rc2' into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-plat.c')
-rw-r--r--drivers/usb/host/xhci-plat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 93b321682b35..8094da34825e 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -430,6 +430,9 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev)
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
int ret;
+ if (pm_runtime_suspended(dev))
+ pm_runtime_resume(dev);
+
ret = xhci_priv_suspend_quirk(hcd);
if (ret)
return ret;