aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQais Yousef <[email protected]>2020-05-18 16:49:30 +0100
committerGreg Kroah-Hartman <[email protected]>2020-05-18 18:15:40 +0200
commit79112cc3c29f4a8c73a21428fbcbcb0afb005e3e (patch)
tree945bfbbffe1621bdff52d91b8d8d446bb13a472b
parent1cb3b0095c3d0bb96912bfbbce4fc006d41f367c (diff)
usb/xhci-plat: Set PM runtime as active on resume
Follow suit of ohci-platform.c and perform pm_runtime_set_active() on resume. ohci-platform.c had a warning reported due to the missing pm_runtime_set_active() [1]. [1] https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Qais Yousef <[email protected]> CC: Tony Prisk <[email protected]> CC: Greg Kroah-Hartman <[email protected]> CC: Mathias Nyman <[email protected]> CC: Oliver Neukum <[email protected]> CC: [email protected] CC: [email protected] CC: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/usb/host/xhci-plat.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 38ac6efb2cc2..f6b4089bfc4a 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -419,7 +419,15 @@ static int __maybe_unused xhci_plat_resume(struct device *dev)
if (ret)
return ret;
- return xhci_resume(xhci, 0);
+ ret = xhci_resume(xhci, 0);
+ if (ret)
+ return ret;
+
+ pm_runtime_disable(dev);
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+
+ return 0;
}
static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev)