lkml.org 
[lkml]   [2022]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 10/43] dmaengine: imx-sdma: Fix error checking in sdma_event_remap
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 7104b9cb35a33ad803a1adbbfa50569b008faf15 ]

    of_parse_phandle() returns NULL on errors, rather than error
    pointers. Using NULL check on grp_np to fix this.

    Fixes: d078cd1b4185 ("dmaengine: imx-sdma: Add imx6sx platform support")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220308064952.15743-1-linmq006@gmail.com
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/imx-sdma.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
    index 99f3f22ed647..02d13a44ba45 100644
    --- a/drivers/dma/imx-sdma.c
    +++ b/drivers/dma/imx-sdma.c
    @@ -1528,7 +1528,7 @@ static int sdma_event_remap(struct sdma_engine *sdma)
    u32 reg, val, shift, num_map, i;
    int ret = 0;

    - if (IS_ERR(np) || IS_ERR(gpr_np))
    + if (IS_ERR(np) || !gpr_np)
    goto out;

    event_remap = of_find_property(np, propname, NULL);
    @@ -1576,7 +1576,7 @@ static int sdma_event_remap(struct sdma_engine *sdma)
    }

    out:
    - if (!IS_ERR(gpr_np))
    + if (gpr_np)
    of_node_put(gpr_np);

    return ret;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-26 10:27    [W:4.397 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site