Commit 4dcd6ce1 authored Mar 13, 2018 by Merlijn Wajer Committed by Greg Kroah-Hartman Apr 29, 2018

usb: musb: Fix external abort in musb_remove on omap2430



commit 94e46a4f2d5eb14059e42f313c098d4854847376 upstream.

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>

parent 9e565114

drivers/usb/musb/musb_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2485,10 +2485,11 @@ static int musb_remove(struct platform_device *pdev)
		musb_generic_disable(musb);
		spin_unlock_irqrestore(&musb->lock, flags);
		musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
		musb_platform_exit(musb);

		pm_runtime_dont_use_autosuspend(musb->controller);
		pm_runtime_put_sync(musb->controller);
		pm_runtime_disable(musb->controller);
		musb_platform_exit(musb);
		musb_phy_callback = NULL;
		if (musb->dma_controller)
		musb_dma_controller_destroy(musb->dma_controller);