diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-07 10:00:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-07 10:00:34 -0700 |
| commit | d3464ccd105b42f87302572ee1f097e6e0b432c6 (patch) | |
| tree | 1e4f92cfbb5b7844dd0ef9774dddb62bc35f8815 /drivers/dma/ti/omap-dma.c | |
| parent | 1e3778cb223e861808ae0daccf353536e7573eed (diff) | |
| parent | cf24aac38698bfa1d021afd3883df3c4c65143a4 (diff) | |
Merge tag 'dmaengine-fix-5.3' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Some late fixes for drivers:
- memory leak in ti crossbar dma driver
- cleanup of omap dma probe
- Fix for link list configuration in sprd dma driver
- Handling fixed for DMACHCLR if iommu is mapped in rcar dma"
* tag 'dmaengine-fix-5.3' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: rcar-dmac: Fix DMACHCLR handling if iommu is mapped
dmaengine: sprd: Fix the DMA link-list configuration
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
dmaengine: ti: dma-crossbar: Fix a memory leak bug
Diffstat (limited to 'drivers/dma/ti/omap-dma.c')
| -rw-r--r-- | drivers/dma/ti/omap-dma.c | 4 |
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) rc = devm_request_irq(&pdev->dev, irq, omap_dma_irq, IRQF_SHARED, "omap-dma-engine", od); - if (rc) + if (rc) { + omap_dma_free(od); return rc; + } } if (omap_dma_glbl_read(od, CAPS_0) & CAPS_0_SUPPORT_LL123) |