lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 23 Jun 2020 21:59:20 +0200 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Qais Yousef <qais.yousef@....com>, Tony Prisk <linux@...sktech.co.nz>, Mathias Nyman <mathias.nyman@...el.com>, Oliver Neukum <oneukum@...e.de>, linux-arm-kernel@...ts.infradead.org, linux-usb@...r.kernel.org, Sasha Levin <sashal@...nel.org> Subject: [PATCH 4.14 104/136] usb/xhci-plat: Set PM runtime as active on resume From: Qais Yousef <qais.yousef@....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@....com> CC: Tony Prisk <linux@...sktech.co.nz> CC: Greg Kroah-Hartman <gregkh@...uxfoundation.org> CC: Mathias Nyman <mathias.nyman@...el.com> CC: Oliver Neukum <oneukum@...e.de> CC: linux-arm-kernel@...ts.infradead.org CC: linux-usb@...r.kernel.org CC: linux-kernel@...r.kernel.org Link: https://lore.kernel.org/r/20200518154931.6144-2-qais.yousef@arm.com Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> Signed-off-by: Sasha Levin <sashal@...nel.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
Powered by blists - more mailing lists