summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2014-03-17 18:36:47 +0530
committerVinod Koul <vinod.koul@intel.com>2014-03-17 18:36:47 +0530
commita3e8230c6479ac87bc6cd656a985fcd1f6dc8d4f (patch)
treef4f3496516c42eac55cf61aad0fa166e198c72b0 /drivers/dma
parent975faaeb9985af9774007277fdb36b3dc897f4c3 (diff)
parent9068b032d0ff9285314d57a88051fe4111bbe73a (diff)
downloadop-kernel-dev-a3e8230c6479ac87bc6cd656a985fcd1f6dc8d4f.zip
op-kernel-dev-a3e8230c6479ac87bc6cd656a985fcd1f6dc8d4f.tar.gz
Merge branch 'topic/tasklet_fix' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/at_hdmac.c1
-rw-r--r--drivers/dma/pch_dma.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index e2c04dc..c13a3bb 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -1569,7 +1569,6 @@ static int at_dma_remove(struct platform_device *pdev)
/* Disable interrupts */
atc_disable_chan_irq(atdma, chan->chan_id);
- tasklet_disable(&atchan->tasklet);
tasklet_kill(&atchan->tasklet);
list_del(&chan->device_node);
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 61fdc54..05fa548 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -964,16 +964,16 @@ static void pch_dma_remove(struct pci_dev *pdev)
if (pd) {
dma_async_device_unregister(&pd->dma);
+ free_irq(pdev->irq, pd);
+
list_for_each_entry_safe(chan, _c, &pd->dma.channels,
device_node) {
pd_chan = to_pd_chan(chan);
- tasklet_disable(&pd_chan->tasklet);
tasklet_kill(&pd_chan->tasklet);
}
pci_pool_destroy(pd->pool);
- free_irq(pdev->irq, pd);
pci_iounmap(pdev, pd->membase);
pci_release_regions(pdev);
pci_disable_device(pdev);
OpenPOWER on IntegriCloud