diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-07-28 10:10:37 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-28 10:10:37 +0530 |
commit | 4bb0439626983fdde5af3ce970bd0ba2070f5378 (patch) | |
tree | 081166e9a6bd98eef39f41171f2e2ef014413bb3 /drivers/dma/sirf-dma.c | |
parent | 89b90c09b5d505dcff1068054f1fc2d2704e909f (diff) | |
parent | 184ff2aa3c0ba7f1cd44ed7e8d766e12e43694e2 (diff) |
Merge branch 'topic/dmaengine_cleanups' into for-linus
Diffstat (limited to 'drivers/dma/sirf-dma.c')
-rw-r--r-- | drivers/dma/sirf-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c index 906877919cf3..d8bc3f2a71db 100644 --- a/drivers/dma/sirf-dma.c +++ b/drivers/dma/sirf-dma.c @@ -980,6 +980,7 @@ static int sirfsoc_dma_remove(struct platform_device *op) of_dma_controller_free(op->dev.of_node); dma_async_device_unregister(&sdma->dma); free_irq(sdma->irq, sdma); + tasklet_kill(&sdma->tasklet); irq_dispose_mapping(sdma->irq); pm_runtime_disable(&op->dev); if (!pm_runtime_status_suspended(&op->dev)) |