| From 41d2fe0ad914e360f55b6694d72693aad8b72b45 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 18 May 2020 16:49:30 +0100 |
| Subject: usb/xhci-plat: Set PM runtime as active on resume |
| |
| From: Qais Yousef <qais.yousef@arm.com> |
| |
| [ 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@e107158-lin.cambridge.arm.com/ |
| |
| Signed-off-by: Qais Yousef <qais.yousef@arm.com> |
| CC: Tony Prisk <linux@prisktech.co.nz> |
| CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| CC: Mathias Nyman <mathias.nyman@intel.com> |
| CC: Oliver Neukum <oneukum@suse.de> |
| CC: linux-arm-kernel@lists.infradead.org |
| CC: linux-usb@vger.kernel.org |
| CC: linux-kernel@vger.kernel.org |
| Link: https://lore.kernel.org/r/20200518154931.6144-2-qais.yousef@arm.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/host/xhci-plat.c | 10 +++++++++- |
| 1 file changed, 9 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c |
| index 2a73592908e1e..7219cbf7c54c2 100644 |
| --- a/drivers/usb/host/xhci-plat.c |
| +++ b/drivers/usb/host/xhci-plat.c |
| @@ -381,7 +381,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) |
| -- |
| 2.25.1 |
| |