Commit 4659119b authored Nov 23, 2020 by Zhang Qilong Committed by Greg Kroah-Hartman Dec 29, 2020

usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe



[ Upstream commit d6ff32478d7e95d6ca199b5c852710d6964d5811 ]

The pm_runtime_enable will decrement the power disable depth. Imbalance
depth will resulted in enabling runtime PM of device fails later.  Thus
a pairing decrement must be needed on the error handling path to keep it
balanced.

Fixes: 6c984b06 ("ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs")
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20201123145719.1455849-1-zhangqilong3@huawei.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0af1cd18

drivers/usb/host/ehci-omap.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)

		err_pm_runtime:
		pm_runtime_put_sync(dev);
		pm_runtime_disable(dev);

		err_phy:
		for (i = 0; i < omap->nports; i++) {