Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65c36555 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

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: d078cd1b ("dmaengine: imx-sdma: Add imx6sx platform support")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20220308064952.15743-1-linmq006@gmail.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ccf554d1

drivers/dma/imx-sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;