mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-08 17:49:45 +00:00
Revert "usb/ehci-platform: Set PM runtime as active on resume"
This reverts commit71f660a1a7
. Eugeniu Rosca writes: On Thu, Jul 09, 2020 at 09:00:23AM +0200, Eugeniu Rosca wrote: >After integrating v4.14.186 commit5410d158ca
("usb/ehci-platform: >Set PM runtime as active on resume") into downstream v4.14.x, we started >to consistently experience below panic [1] on every second s2ram of >R-Car H3 Salvator-X Renesas reference board. > >After some investigations, we concluded the following: > - the issue does not exist in vanilla v5.8-rc4+ > - [bisecting shows that] the panic on v4.14.186 is caused by the lack > of v5.6-rc1 commit987351e1ea
("phy: core: Add consumer device > link support"). Getting evidence for that is easy. Reverting >987351e1ea
in vanilla leads to a similar backtrace [2]. > >Questions: > - Backporting987351e1ea
("phy: core: Add consumer device > link support") to v4.14.187 looks challenging enough, so probably not > worth it. Anybody to contradict this? > - Assuming no plans to backport the missing mainline commit to v4.14.x, > should the following three v4.14.186 commits be reverted on v4.14.x? > *baef809ea4
("usb/ohci-platform: Fix a warning when hibernating") > *9f33eff495
("usb/xhci-plat: Set PM runtime as active on resume") > *5410d158ca
("usb/ehci-platform: Set PM runtime as active on resume") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7c2011825d
commit
9b83c99f1e
1 changed files with 0 additions and 4 deletions
|
@ -457,10 +457,6 @@ 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);
|
||||
|
||||
if (priv->quirk_poll)
|
||||
quirk_poll_init(priv);
|
||||
|
||||
|
|
Loading…
Reference in a new issue