diff options
author | Peter Zijlstra <peterz@infradead.org> | 2020-07-08 11:38:59 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-08 11:38:59 +0200 |
commit | faa2fd7cbad4609d06d7904c0a80cf2f8cd23678 (patch) | |
tree | 3a5bfcc8879b719aec97cb73ed6e020cde502546 /drivers/usb/host/xhci-mtk.c | |
parent | sched/core: Remove mmdrop() definition (diff) | |
parent | sched: Fix unreliable rseq cpu_id for new tasks (diff) | |
download | wireguard-linux-faa2fd7cbad4609d06d7904c0a80cf2f8cd23678.tar.xz wireguard-linux-faa2fd7cbad4609d06d7904c0a80cf2f8cd23678.zip |
Merge branch 'sched/urgent'
Diffstat (limited to 'drivers/usb/host/xhci-mtk.c')
-rw-r--r-- | drivers/usb/host/xhci-mtk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index bfbdb3ceed29..4311d4c9b68d 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -587,6 +587,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); @@ -597,8 +600,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; } |