lkml.org 
[lkml]   [2018]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 3.18 21/25] dmaengine: jz4740: disable/unprepare clk if probe fails
    Date
    From: Tobias Jordan <Tobias.Jordan@elektrobit.com>

    [ Upstream commit eb9436966fdc84cebdf222952a99898ab46d9bb0 ]

    in error path of jz4740_dma_probe(), call clk_disable_unprepare() to clean
    up.

    Found by Linux Driver Verification project (linuxtesting.org).

    Fixes: 25ce6c35fea0 MIPS: jz4740: Remove custom DMA API
    Signed-off-by: Tobias Jordan <Tobias.Jordan@elektrobit.com>
    Signed-off-by: Vinod Koul <vinod.koul@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/dma/dma-jz4740.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/dma/dma-jz4740.c b/drivers/dma/dma-jz4740.c
    index ae2ab14e64b3..a2a9726a6871 100644
    --- a/drivers/dma/dma-jz4740.c
    +++ b/drivers/dma/dma-jz4740.c
    @@ -575,7 +575,7 @@ static int jz4740_dma_probe(struct platform_device *pdev)

    ret = dma_async_device_register(dd);
    if (ret)
    - return ret;
    + goto err_clk;

    irq = platform_get_irq(pdev, 0);
    ret = request_irq(irq, jz4740_dma_irq, 0, dev_name(&pdev->dev), dmadev);
    @@ -588,6 +588,8 @@ static int jz4740_dma_probe(struct platform_device *pdev)

    err_unregister:
    dma_async_device_unregister(dd);
    +err_clk:
    + clk_disable_unprepare(dmadev->clk);
    return ret;
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2018-01-28 23:32    [W:4.284 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site