mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
dmaengine: imx-sdma: Fix error checking in sdma_event_remap
[ Upstream commit7104b9cb35
] of_parse_phandle() returns NULL on errors, rather than error pointers. Using NULL check on grp_np to fix this. Fixes:d078cd1b41
("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>
This commit is contained in:
parent
90187e02a7
commit
2c89b4d022
1 changed files with 2 additions and 2 deletions
|
@ -1528,7 +1528,7 @@ static int sdma_event_remap(struct sdma_engine *sdma)
|
||||||
u32 reg, val, shift, num_map, i;
|
u32 reg, val, shift, num_map, i;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (IS_ERR(np) || IS_ERR(gpr_np))
|
if (IS_ERR(np) || !gpr_np)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
event_remap = of_find_property(np, propname, NULL);
|
event_remap = of_find_property(np, propname, NULL);
|
||||||
|
@ -1576,7 +1576,7 @@ static int sdma_event_remap(struct sdma_engine *sdma)
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (!IS_ERR(gpr_np))
|
if (gpr_np)
|
||||||
of_node_put(gpr_np);
|
of_node_put(gpr_np);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue