diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-03-06 07:54:08 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-03-17 14:04:11 +0100 |
| commit | 9068b032d0ff9285314d57a88051fe4111bbe73a (patch) | |
| tree | 80cd2c7749716c1483d2a45bca232587407cd98d /drivers/dma | |
| parent | dmaengine: at_hdmac: use tasklet_kill in teardown (diff) | |
| download | linux-9068b032d0ff9285314d57a88051fe4111bbe73a.tar.xz linux-9068b032d0ff9285314d57a88051fe4111bbe73a.zip | |
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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/pch_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |