From: Kisang Lee Date: Wed, 27 Jun 2018 02:05:43 +0000 (+0900) Subject: [COMMON] usb: xhci: move location of wake_unlock for stable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cce2ae2f94d177f17f0546a3cfa63e4f08e6d591;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] usb: xhci: move location of wake_unlock for stable Change-Id: I4c251312240342304a8631d81c63f06a240f4d83 Signed-off-by: Kisang Lee --- diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index a8703f6ba527..7524a166c3b5 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -532,6 +532,10 @@ static int xhci_plat_remove(struct platform_device *dev) } xhci_dbg(xhci, "%s: waited %dmsec", __func__, timeout); + dev_info(&dev->dev, "WAKE UNLOCK\n"); + wake_unlock(xhci->wakelock); + wake_lock_destroy(xhci->wakelock); + xhci->xhc_state |= XHCI_STATE_REMOVING; usb_remove_hcd(xhci->shared_hcd); @@ -553,10 +557,6 @@ static int xhci_plat_remove(struct platform_device *dev) clk_disable_unprepare(clk); usb_put_hcd(hcd); - dev_info(&dev->dev, "WAKE UNLOCK\n"); - wake_unlock(xhci->wakelock); - wake_lock_destroy(xhci->wakelock); - pm_runtime_set_suspended(&dev->dev); pm_runtime_disable(&dev->dev);