lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 52/56] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
    Date
    From: Wenwen Wang <wenwen@cs.uga.edu>

    [ Upstream commit 962411b05a6d3342aa649e39cda1704c1fc042c6 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/omap-dma.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
    index 1dfc71c90123f..57b6e6ca14a88 100644
    --- a/drivers/dma/omap-dma.c
    +++ b/drivers/dma/omap-dma.c
    @@ -1199,8 +1199,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;
    + }
    }

    rc = dma_async_device_register(&od->ddev);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:24    [W:4.079 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site