[PATCH] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()

[PATCH] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()

[Wenwen Wang]

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>
---
 drivers/dma/ti/omap-dma.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
index ba2489d..5158b58 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)
-- 
2.7.4

Re: [PATCH] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()

[Peter Ujfalusi]

On 16/08/2019 9.56, Wenwen Wang wrote:
> 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.

Thank you,
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> ---
>  drivers/dma/ti/omap-dma.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
> index ba2489d..5158b58 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)
> 

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Re: [PATCH] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()

[Vinod Koul]

On 16-08-19, 01:56, Wenwen Wang wrote:
> 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.

Applied, thanks

-- 
~Vinod