Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57a1cd87 authored by Qais Yousef's avatar Qais Yousef Committed by Greg Kroah-Hartman
Browse files

usb/xhci-plat: Set PM runtime as active on resume 

[ 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: default avatarQais 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 33a76c15

drivers/usb/host/xhci-plat.c

+9 −1
Original line number Diff line number Diff line
@@ -410,7 +410,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)