diff options
| author | Miaoqian Lin <linmq006@gmail.com> | 2022-03-08 06:49:51 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-27 13:39:42 +0200 |
| commit | 50aa5ba6f6e2f2afc029aaf8cba9ae293dd6bd64 (patch) | |
| tree | 97c7fc12b224b65384d1a0fd8686ca3e5ad568d3 /drivers/dma | |
| parent | 43f796096da57d9a42f5a366c3839002f795df1e (diff) | |
| download | linux-stable-50aa5ba6f6e2f2afc029aaf8cba9ae293dd6bd64.tar.gz linux-stable-50aa5ba6f6e2f2afc029aaf8cba9ae293dd6bd64.tar.bz2 linux-stable-50aa5ba6f6e2f2afc029aaf8cba9ae293dd6bd64.zip | |
dmaengine: imx-sdma: Fix error checking in sdma_event_remap
[ 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>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index eea89c3b54c1..709ead443fc5 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1771,7 +1771,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); @@ -1819,7 +1819,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; |