xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmaengine: imx-sdma: Fix error checking in sdma_event_remap

Browse Source 
[ Upstream commit 7104b9cb35a33ad803a1adbbfa50569b008faf15 ]

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:
Miaoqian Lin
2022-03-08 06:49:51 +00:00
committed by Greg Kroah-Hartman
parent 12aa8021c7
commit 9bc949a181
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/imx-sdma.c
View File

@@ -1789,7 +1789,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);
@@ -1837,7 +1837,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;