lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 631/639] dmaengine: ti: edma: fix missed failure handling
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ]

    When devm_kcalloc fails, it forgets to call edma_free_slot.
    Replace direct return with failure handler to fix it.

    Fixes: 1be5336bc7ba ("dmaengine: edma: New device tree binding")
    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Link: https://lore.kernel.org/r/20191118073802.28424-1-hslester96@gmail.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/ti/edma.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c
    index 982631d4e1f8a..44158fa859737 100644
    --- a/drivers/dma/ti/edma.c
    +++ b/drivers/dma/ti/edma.c
    @@ -2345,8 +2345,10 @@ static int edma_probe(struct platform_device *pdev)

    ecc->tc_list = devm_kcalloc(dev, ecc->num_tc,
    sizeof(*ecc->tc_list), GFP_KERNEL);
    - if (!ecc->tc_list)
    - return -ENOMEM;
    + if (!ecc->tc_list) {
    + ret = -ENOMEM;
    + goto err_reg1;
    + }

    for (i = 0;; i++) {
    ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs",
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:38    [W:2.158 / U:26.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site