lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 025/542] dmaengine: ti: edma: Fix error return code in edma_probe()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit d1fd03a35efc6285e43f4ef35ef04dbf2c9389c6 ]

    Fix to return negative error code -ENOMEM from the error handling
    case instead of 0, as done elsewhere in this function.

    Fixes: 2a03c1314506 ("dmaengine: ti: edma: add missed operations")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Link: https://lore.kernel.org/r/20191212114622.127322-1-weiyongjun1@huawei.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/ti/edma.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c
    index 0628ee4bf1b41..03a7f647f7b2c 100644
    --- a/drivers/dma/ti/edma.c
    +++ b/drivers/dma/ti/edma.c
    @@ -2342,8 +2342,10 @@ static int edma_probe(struct platform_device *pdev)
    ecc->channels_mask = devm_kcalloc(dev,
    BITS_TO_LONGS(ecc->num_channels),
    sizeof(unsigned long), GFP_KERNEL);
    - if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask)
    + if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) {
    + ret = -ENOMEM;
    goto err_disable_pm;
    + }

    /* Mark all channels available initially */
    bitmap_fill(ecc->channels_mask, ecc->num_channels);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:23    [W:2.111 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site