summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2014-09-02 21:57:20 +0200
committerFelipe Balbi <balbi@ti.com>2014-09-03 23:50:44 +0200
commitfed33afce0eda44a46ae24d93aec1b5198c0bac4 (patch)
treec283d2fb4ef37f5d2b42e106fc6860c48ee557cb
parentusb: dwc3: gadget: Fix desc NULL pointer in dwc3_gadget_ep_queue() (diff)
downloadlinux-fed33afce0eda44a46ae24d93aec1b5198c0bac4.tar.xz
linux-fed33afce0eda44a46ae24d93aec1b5198c0bac4.zip
usb: dwc3: core: fix order of PM runtime calls
Currently, we disable pm_runtime before all register accesses are done, this is dangerous and might lead to abort exceptions due to the driver trying to access a register which is clocked by a clock which was long gated. Fix that by moving pm_runtime_put_sync() and pm_runtime_disable() as the last thing we do before returning from our ->remove() method. Fixes: 72246da (usb: Introduce DesignWare USB3 DRD Driver) Cc: <stable@vger.kernel.org> # v3.2+ Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/dwc3/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index b769c1faaf03..a664d5b5bdfd 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -804,15 +804,15 @@ static int dwc3_remove(struct platform_device *pdev)
phy_power_off(dwc->usb2_generic_phy);
phy_power_off(dwc->usb3_generic_phy);
- pm_runtime_put_sync(&pdev->dev);
- pm_runtime_disable(&pdev->dev);
-
dwc3_debugfs_exit(dwc);
dwc3_core_exit_mode(dwc);
dwc3_event_buffers_cleanup(dwc);
dwc3_free_event_buffers(dwc);
dwc3_core_exit(dwc);
+ pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+
return 0;
}