| From 25f96ee8224f2d0cec56ccf9b127a40e769e8b8f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 8 Mar 2022 06:49:51 +0000 |
| Subject: dmaengine: imx-sdma: Fix error checking in sdma_event_remap |
| |
| 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 cc70da05db4b..801bef83df2a 100644 |
| --- a/drivers/dma/imx-sdma.c |
| +++ b/drivers/dma/imx-sdma.c |
| @@ -1784,7 +1784,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); |
| @@ -1832,7 +1832,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 |
| |
