Merge branch 'topic/tasklet_fix' into for-linus

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index e2c04dc81e2a..c13a3bb0f594 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 61fdc54a3c88..05fa548bd659 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);