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/qcom | |
| parent | 89b90c09b5d505dcff1068054f1fc2d2704e909f (diff) | |
| parent | 184ff2aa3c0ba7f1cd44ed7e8d766e12e43694e2 (diff) | |
Merge branch 'topic/dmaengine_cleanups' into for-linus
Diffstat (limited to 'drivers/dma/qcom')
| -rw-r--r-- | drivers/dma/qcom/hidma.c | 1 | ||||
| -rw-r--r-- | drivers/dma/qcom/hidma_ll.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index 41b5c6dee713..b2374cd91e45 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -708,6 +708,7 @@ static int hidma_remove(struct platform_device *pdev) pm_runtime_get_sync(dmadev->ddev.dev); dma_async_device_unregister(&dmadev->ddev); devm_free_irq(dmadev->ddev.dev, dmadev->irq, dmadev->lldev); + tasklet_kill(&dmadev->task); hidma_debug_uninit(dmadev); hidma_ll_uninit(dmadev->lldev); hidma_free(dmadev); diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index f3929001539b..ad20dfb64c71 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -831,6 +831,7 @@ int hidma_ll_uninit(struct hidma_lldev *lldev) required_bytes = sizeof(struct hidma_tre) * lldev->nr_tres; tasklet_kill(&lldev->task); + tasklet_kill(&lldev->rst_task); memset(lldev->trepool, 0, required_bytes); lldev->trepool = NULL; lldev->pending_tre_count = 0; |