diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-07-04 12:45:26 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 17:49:03 +0300 |
| commit | a46018929b35f551e29302a89de5ef20c1cfd4f8 (patch) | |
| tree | 7c7934f657fb0392de654250ffc89b2379186eb1 /drivers/dma | |
| parent | 486b10a255f70735585c90d334422da65dfe43ac (diff) | |
| download | linux-a46018929b35f551e29302a89de5ef20c1cfd4f8.tar.xz | |
dmaengine: mmp_pdma: explicitly freeup irq
dmaengine device should explicitly call devm_free_irq() when using
devm_request_irq().
The irq is still ON when devices remove is executed and irq should be
quiesced before remove is completed.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mmp_pdma.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index 56f1fd68b620..f4b25fb0d040 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c @@ -931,6 +931,25 @@ static void dma_do_tasklet(unsigned long data) static int mmp_pdma_remove(struct platform_device *op) { struct mmp_pdma_device *pdev = platform_get_drvdata(op); + struct mmp_pdma_phy *phy; + int i, irq = 0, irq_num = 0; + + + for (i = 0; i < pdev->dma_channels; i++) { + if (platform_get_irq(op, i) > 0) + irq_num++; + } + + if (irq_num != pdev->dma_channels) { + irq = platform_get_irq(op, 0); + devm_free_irq(&op->dev, irq, pdev); + } else { + for (i = 0; i < pdev->dma_channels; i++) { + phy = &pdev->phy[i]; + irq = platform_get_irq(op, i); + devm_free_irq(&op->dev, irq, phy); + } + } dma_async_device_unregister(&pdev->device); return 0; |