diff options
author | Merlijn Wajer <merlijn@wizzup.org> | 2018-03-13 10:48:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-13 11:36:59 -0400 |
commit | 94e46a4f2d5eb14059e42f313c098d4854847376 (patch) | |
tree | 0abddd490adb1a1d7f9753af6769794b6c4bc91c | |
parent | 914a020d4a970828837f44759209c956f9cf9c00 (diff) |
usb: musb: Fix external abort in musb_remove on omap2430
This fixes an oops on unbind / module unload (on the musb omap2430
platform).
musb_remove function now calls musb_platform_exit before disabling
runtime pm.
Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/musb/musb_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index c344ef4e5355..4d723077be2b 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -2473,11 +2473,11 @@ static int musb_remove(struct platform_device *pdev) | |||
2473 | musb_disable_interrupts(musb); | 2473 | musb_disable_interrupts(musb); |
2474 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | 2474 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); |
2475 | spin_unlock_irqrestore(&musb->lock, flags); | 2475 | spin_unlock_irqrestore(&musb->lock, flags); |
2476 | musb_platform_exit(musb); | ||
2476 | 2477 | ||
2477 | pm_runtime_dont_use_autosuspend(musb->controller); | 2478 | pm_runtime_dont_use_autosuspend(musb->controller); |
2478 | pm_runtime_put_sync(musb->controller); | 2479 | pm_runtime_put_sync(musb->controller); |
2479 | pm_runtime_disable(musb->controller); | 2480 | pm_runtime_disable(musb->controller); |
2480 | musb_platform_exit(musb); | ||
2481 | musb_phy_callback = NULL; | 2481 | musb_phy_callback = NULL; |
2482 | if (musb->dma_controller) | 2482 | if (musb->dma_controller) |
2483 | musb_dma_controller_destroy(musb->dma_controller); | 2483 | musb_dma_controller_destroy(musb->dma_controller); |