diff options
author | Felipe Balbi <balbi@ti.com> | 2014-09-02 15:57:20 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-09-03 17:50:44 -0400 |
commit | fed33afce0eda44a46ae24d93aec1b5198c0bac4 (patch) | |
tree | c283d2fb4ef37f5d2b42e106fc6860c48ee557cb /drivers/usb/dwc3/core.c | |
parent | fdee4ebac96bb44c9c488fdd830b7cc831cd295d (diff) |
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>
Diffstat (limited to 'drivers/usb/dwc3/core.c')
-rw-r--r-- | drivers/usb/dwc3/core.c | 6 |
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) | |||
804 | phy_power_off(dwc->usb2_generic_phy); | 804 | phy_power_off(dwc->usb2_generic_phy); |
805 | phy_power_off(dwc->usb3_generic_phy); | 805 | phy_power_off(dwc->usb3_generic_phy); |
806 | 806 | ||
807 | pm_runtime_put_sync(&pdev->dev); | ||
808 | pm_runtime_disable(&pdev->dev); | ||
809 | |||
810 | dwc3_debugfs_exit(dwc); | 807 | dwc3_debugfs_exit(dwc); |
811 | dwc3_core_exit_mode(dwc); | 808 | dwc3_core_exit_mode(dwc); |
812 | dwc3_event_buffers_cleanup(dwc); | 809 | dwc3_event_buffers_cleanup(dwc); |
813 | dwc3_free_event_buffers(dwc); | 810 | dwc3_free_event_buffers(dwc); |
814 | dwc3_core_exit(dwc); | 811 | dwc3_core_exit(dwc); |
815 | 812 | ||
813 | pm_runtime_put_sync(&pdev->dev); | ||
814 | pm_runtime_disable(&pdev->dev); | ||
815 | |||
816 | return 0; | 816 | return 0; |
817 | } | 817 | } |
818 | 818 | ||