diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-02 14:57:20 -0500 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 18:02:26 +0800 |
| commit | 93408be9e1ea67f14fe0c1c46a430f33cbef4180 (patch) | |
| tree | 378f618f574b7d00ac303ffe1666771a87ae78b2 | |
| parent | 45b95d1615eaf3efde4f7f9dd4ca83884d96db67 (diff) | |
usb: dwc3: core: fix order of PM runtime calls
commit fed33afce0eda44a46ae24d93aec1b5198c0bac4 upstream.
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)
Signed-off-by: Felipe Balbi <balbi@ti.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -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 99b58d84553a..6da443532c70 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -563,9 +563,6 @@ static int __devexit dwc3_remove(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - pm_runtime_put(&pdev->dev); - pm_runtime_disable(&pdev->dev); - dwc3_debugfs_exit(dwc); switch (dwc->mode) { @@ -586,6 +583,9 @@ static int __devexit dwc3_remove(struct platform_device *pdev) dwc3_core_exit(dwc); + pm_runtime_put(&pdev->dev); + pm_runtime_disable(&pdev->dev); + return 0; } |