summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-07-01 11:16:47 +0530
committerVinod Koul <vinod.koul@intel.com>2016-07-16 20:18:57 +0530
commit85abae1760b5ec66d7b77d3d690ff65a84a8d592 (patch)
tree3a7c44435cf68461ef87027aa3d77f359189b6c2 /drivers/dma
parent7bb45f669610e0fae4b3dfe66056cf85a57014c6 (diff)
downloadlinux-85abae1760b5ec66d7b77d3d690ff65a84a8d592.tar.gz
linux-85abae1760b5ec66d7b77d3d690ff65a84a8d592.tar.bz2
linux-85abae1760b5ec66d7b77d3d690ff65a84a8d592.zip
dmaengine: coh901318: kill the tasklets upon exit
drivers should ensure that tasklets are killed, so that they can't be run after driver remove is executed. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/coh901318.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index ba044d4c1d53..9b86c3e85011 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -2758,6 +2758,21 @@ static int __init coh901318_probe(struct platform_device *pdev)
coh901318_pool_destroy(&base->pool);
return err;
}
+static void coh901318_base_remove(struct coh901318_base *base, const int *pick_chans)
+{
+ int chans_i;
+ int i = 0;
+ struct coh901318_chan *cohc;
+
+ for (chans_i = 0; pick_chans[chans_i] != -1; chans_i += 2) {
+ for (i = pick_chans[chans_i]; i <= pick_chans[chans_i+1]; i++) {
+ cohc = &base->chans[i];
+
+ tasklet_kill(&cohc->tasklet);
+ }
+ }
+
+}
static int coh901318_remove(struct platform_device *pdev)
{
@@ -2765,6 +2780,9 @@ static int coh901318_remove(struct platform_device *pdev)
devm_free_irq(&pdev->dev, base->irq, base);
+ coh901318_base_remove(base, dma_slave_channels);
+ coh901318_base_remove(base, dma_memcpy_channels);
+
of_dma_controller_free(pdev->dev.of_node);
dma_async_device_unregister(&base->dma_memcpy);
dma_async_device_unregister(&base->dma_slave);