summaryrefslogtreecommitdiffstats
path: root/drivers/dma/omap-dma.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-07-28 10:10:37 +0530
committerVinod Koul <vinod.koul@intel.com>2016-07-28 10:10:37 +0530
commit4bb0439626983fdde5af3ce970bd0ba2070f5378 (patch)
tree081166e9a6bd98eef39f41171f2e2ef014413bb3 /drivers/dma/omap-dma.c
parent89b90c09b5d505dcff1068054f1fc2d2704e909f (diff)
parent184ff2aa3c0ba7f1cd44ed7e8d766e12e43694e2 (diff)
downloadlinux-4bb0439626983fdde5af3ce970bd0ba2070f5378.tar.bz2
Merge branch 'topic/dmaengine_cleanups' into for-linus
Diffstat (limited to 'drivers/dma/omap-dma.c')
-rw-r--r--drivers/dma/omap-dma.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 2e0d49bcfd8a..d99ca2b511c4 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -1292,10 +1292,14 @@ static int omap_dma_probe(struct platform_device *pdev)
static int omap_dma_remove(struct platform_device *pdev)
{
struct omap_dmadev *od = platform_get_drvdata(pdev);
+ int irq;
if (pdev->dev.of_node)
of_dma_controller_free(pdev->dev.of_node);
+ irq = platform_get_irq(pdev, 1);
+ devm_free_irq(&pdev->dev, irq, od);
+
dma_async_device_unregister(&od->ddev);
if (!od->legacy) {