浏览代码

dmaengine: pch_dma: use tasklet_kill in teardown

As discussed in [1] the tasklet_disable is not a proper function for teardown.
We need to ensure irq is disabled, followed by ensuring that don't schedule any
more tasklets and then its safe to use tasklet_kill().

Here in pch dma driver we need to use free_irq() before tasklet_kill(). So move
up the free_irq() which will ensure that the irq is disabled and also wait till
all scheduled interrupts are executed by invoking synchronize_irq().

[1]: http://lwn.net/Articles/588457/

Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul 11 年之前
父节点
当前提交
9068b032d0
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/dma/pch_dma.c

+ 2 - 2
drivers/dma/pch_dma.c

@@ -964,16 +964,16 @@ static void pch_dma_remove(struct pci_dev *pdev)
 	if (pd) {
 	if (pd) {
 		dma_async_device_unregister(&pd->dma);
 		dma_async_device_unregister(&pd->dma);
 
 
+		free_irq(pdev->irq, pd);
+
 		list_for_each_entry_safe(chan, _c, &pd->dma.channels,
 		list_for_each_entry_safe(chan, _c, &pd->dma.channels,
 					 device_node) {
 					 device_node) {
 			pd_chan = to_pd_chan(chan);
 			pd_chan = to_pd_chan(chan);
 
 
-			tasklet_disable(&pd_chan->tasklet);
 			tasklet_kill(&pd_chan->tasklet);
 			tasklet_kill(&pd_chan->tasklet);
 		}
 		}
 
 
 		pci_pool_destroy(pd->pool);
 		pci_pool_destroy(pd->pool);
-		free_irq(pdev->irq, pd);
 		pci_iounmap(pdev, pd->membase);
 		pci_iounmap(pdev, pd->membase);
 		pci_release_regions(pdev);
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);
 		pci_disable_device(pdev);