[PATCH] dmaengine: imx-sdma: Fix error checking in sdma_event_remap

Miaoqian Lin posted 1 patch 4 years, 3 months ago
drivers/dma/imx-sdma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] dmaengine: imx-sdma: Fix error checking in sdma_event_remap
Posted by Miaoqian Lin 4 years, 3 months ago
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>
---
 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 75ec0754d4ad..0be1171610af 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1869,7 +1869,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);
@@ -1917,7 +1917,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.17.1
Re: [PATCH] dmaengine: imx-sdma: Fix error checking in sdma_event_remap
Posted by Vinod Koul 4 years, 2 months ago
On 08-03-22, 06:49, Miaoqian Lin wrote:
> of_parse_phandle() returns NULL on errors, rather than error
> pointers. Using NULL check on grp_np to fix this.

Applied, thanks

-- 
~Vinod