From: Sebastian Andrzej Siewior Date: Wed, 16 Oct 2013 10:50:07 +0000 (+0200) Subject: usb: musb: core: Call dma_controller_destroy() in error path only once. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8d1aad7485e653c2c5fd985b326096f680f7d918;p=linux-beck.git usb: musb: core: Call dma_controller_destroy() in error path only once. In commit f3ce4d5 ("usb: musb: core: call dma_controller_destroy() in the err path") I erroneously assumed that the dma controller is not removed in the error patch. This was wrong because it happens later via musb_free(). That means the original commit can be reverted because it is wrong or we do this, so it is more obvious. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 6203ad38e913..7fd213785d52 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1764,8 +1764,6 @@ static void musb_free(struct musb *musb) free_irq(musb->nIrq, musb); } cancel_work_sync(&musb->irq_work); - if (musb->dma_controller) - dma_controller_destroy(musb->dma_controller); musb_host_free(musb); } @@ -1990,6 +1988,9 @@ static int musb_remove(struct platform_device *pdev) musb_exit_debugfs(musb); musb_shutdown(pdev); + if (musb->dma_controller) + dma_controller_destroy(musb->dma_controller); + musb_free(musb); device_init_wakeup(dev, 0); return 0;