| From 587ed5f8c38a471ebfa98f594adbb4f7433e2983 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 18 May 2020 16:49:31 +0100 |
| Subject: usb/ehci-platform: Set PM runtime as active on resume |
| |
| From: Qais Yousef <qais.yousef@arm.com> |
| |
| [ Upstream commit 16bdc04cc98ab0c74392ceef2475ecc5e73fcf49 ] |
| |
| 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/ |
| |
| Acked-by: Alan Stern <stern@rowland.harvard.edu> |
| 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-3-qais.yousef@arm.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/host/ehci-platform.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c |
| index f1908ea9fbd86..6fcd332880143 100644 |
| --- a/drivers/usb/host/ehci-platform.c |
| +++ b/drivers/usb/host/ehci-platform.c |
| @@ -390,6 +390,11 @@ static int ehci_platform_resume(struct device *dev) |
| } |
| |
| ehci_resume(hcd, priv->reset_on_resume); |
| + |
| + pm_runtime_disable(dev); |
| + pm_runtime_set_active(dev); |
| + pm_runtime_enable(dev); |
| + |
| return 0; |
| } |
| #endif /* CONFIG_PM_SLEEP */ |
| -- |
| 2.25.1 |
| |
