summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenwen Wang <wenwen@cs.uga.edu>2019-08-16 02:56:08 -0400
committerVinod Koul <vkoul@kernel.org>2019-08-20 07:46:17 -0400
commit962411b05a6d3342aa649e39cda1704c1fc042c6 (patch)
tree3fcd55c70961c7890f96604fb013163974ea4aa9
parent2c231c0c1dec42192aca0f87f2dc68b8f0cbc7d2 (diff)
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
If devm_request_irq() fails to disable all interrupts, no cleanup is performed before retuning the error. To fix this issue, invoke omap_dma_free() to do the cleanup. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Link: https://lore.kernel.org/r/1565938570-7528-1-git-send-email-wenwen@cs.uga.edu Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r--drivers/dma/ti/omap-dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index ba27802efcd0..d07c0d5de7a2 100644
--- a/drivers/dma/ti/omap-dma.c
+++ b/drivers/dma/ti/omap-dma.c
@@ -1540,8 +1540,10 @@ static int omap_dma_probe(struct platform_device *pdev)
1540 1540
1541 rc = devm_request_irq(&pdev->dev, irq, omap_dma_irq, 1541 rc = devm_request_irq(&pdev->dev, irq, omap_dma_irq,
1542 IRQF_SHARED, "omap-dma-engine", od); 1542 IRQF_SHARED, "omap-dma-engine", od);
1543 if (rc) 1543 if (rc) {
1544 omap_dma_free(od);
1544 return rc; 1545 return rc;
1546 }
1545 } 1547 }
1546 1548
1547 if (omap_dma_glbl_read(od, CAPS_0) & CAPS_0_SUPPORT_LL123) 1549 if (omap_dma_glbl_read(od, CAPS_0) & CAPS_0_SUPPORT_LL123)