diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-07-05 00:32:16 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 10:49:05 -0400 |
commit | 46cf94d6ab38420690d890d9922bfc61a7b3e2c5 (patch) | |
tree | f31f52c7973500c9b463d6d58b644f3138355d00 /drivers/dma/pl330.c | |
parent | 898dbbf65f1d041d5c1b29a0880286e26fac5076 (diff) |
dmaengine: pl330: 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>
Cc: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r-- | drivers/dma/pl330.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index c8767d3e5eb0..4fc3ffbd5ca0 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c | |||
@@ -3002,12 +3002,18 @@ static int pl330_remove(struct amba_device *adev) | |||
3002 | { | 3002 | { |
3003 | struct pl330_dmac *pl330 = amba_get_drvdata(adev); | 3003 | struct pl330_dmac *pl330 = amba_get_drvdata(adev); |
3004 | struct dma_pl330_chan *pch, *_p; | 3004 | struct dma_pl330_chan *pch, *_p; |
3005 | int i, irq; | ||
3005 | 3006 | ||
3006 | pm_runtime_get_noresume(pl330->ddma.dev); | 3007 | pm_runtime_get_noresume(pl330->ddma.dev); |
3007 | 3008 | ||
3008 | if (adev->dev.of_node) | 3009 | if (adev->dev.of_node) |
3009 | of_dma_controller_free(adev->dev.of_node); | 3010 | of_dma_controller_free(adev->dev.of_node); |
3010 | 3011 | ||
3012 | for (i = 0; i < AMBA_NR_IRQS; i++) { | ||
3013 | irq = adev->irq[i]; | ||
3014 | devm_free_irq(&adev->dev, irq, pl330); | ||
3015 | } | ||
3016 | |||
3011 | dma_async_device_unregister(&pl330->ddma); | 3017 | dma_async_device_unregister(&pl330->ddma); |
3012 | 3018 | ||
3013 | /* Idle the DMAC */ | 3019 | /* Idle the DMAC */ |