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

Commit fdde3666 authored by Macpaul Lin's avatar Macpaul Lin Committed by Sasha Levin
Browse files

usb: host: xhci-mtk: avoid runtime suspend when removing hcd 



commit a24d5072e87457a14023ee1dd3fc8b1e76f899ef upstream.

When runtime suspend was enabled, runtime suspend might happen
when xhci is removing hcd. This might cause kernel panic when hcd
has been freed but runtime pm suspend related handle need to
reference it.

Signed-off-by: default avatarMacpaul Lin <macpaul.lin@mediatek.com>
Reviewed-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200624135949.22611-4-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 290156ff

drivers/usb/host/xhci-mtk.c

+3 −2
Original line number Diff line number Diff line
@@ -592,6 +592,9 @@ static int xhci_mtk_remove(struct platform_device *dev) 
	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);

	struct usb_hcd  *shared_hcd = xhci->shared_hcd;



	pm_runtime_put_noidle(&dev->dev);

	pm_runtime_disable(&dev->dev);



	usb_remove_hcd(shared_hcd);

	xhci->shared_hcd = NULL;

	device_init_wakeup(&dev->dev, false);
@@ -602,8 +605,6 @@ static int xhci_mtk_remove(struct platform_device *dev) 
	xhci_mtk_sch_exit(mtk);

	xhci_mtk_clks_disable(mtk);

	xhci_mtk_ldos_disable(mtk);

	pm_runtime_put_sync(&dev->dev);

	pm_runtime_disable(&dev->dev);



	return 0;

}