From: Qais Yousef <qais.yousef@xxxxxxx> [ Upstream commit 79112cc3c29f4a8c73a21428fbcbcb0afb005e3e ] 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/20200323143857.db5zphxhq4hz3hmd@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx/ Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx> CC: Tony Prisk <linux@xxxxxxxxxxxxxxx> CC: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> CC: Mathias Nyman <mathias.nyman@xxxxxxxxx> CC: Oliver Neukum <oneukum@xxxxxxx> CC: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx CC: linux-usb@xxxxxxxxxxxxxxx CC: linux-kernel@xxxxxxxxxxxxxxx Link: https://lore.kernel.org/r/20200518154931.6144-2-qais.yousef@xxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- drivers/usb/host/xhci-plat.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index c4c40e9d42471..510fb7853f92a 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -249,8 +249,17 @@ static int xhci_plat_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); + int ret; + + ret = xhci_resume(xhci, 0); + if (ret) + return ret; - return xhci_resume(xhci, 0); + pm_runtime_disable(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + return 0; } static const struct dev_pm_ops xhci_plat_pm_ops = { -- 2.25.1
