Commit 5ef074e8 authored by Mathieu Poirier's avatar Mathieu Poirier
Browse files

remoteproc: imx_rproc: Call of_node_put() on iteration error 



Function of_phandle_iterator_next() calls of_node_put() on the last
device_node it iterated over, but when the loop exits prematurely it has
to be called explicitly.

Fixes: b29b4249 ("remoteproc: imx_rproc: add i.MX specific parse fw hook")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-5-mathieu.poirier@linaro.org


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent f8bae637

drivers/remoteproc/imx_rproc.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -541,6 +541,7 @@ static int imx_rproc_prepare(struct rproc *rproc) 




		rmem = of_reserved_mem_lookup(it.node);

		rmem = of_reserved_mem_lookup(it.node);

		if (!rmem) {

		if (!rmem) {

			of_node_put(it.node);

			dev_err(priv->dev, "unable to acquire memory-region\n");

			dev_err(priv->dev, "unable to acquire memory-region\n");

			return -EINVAL;

			return -EINVAL;

		}

		}
@@ -553,10 +554,12 @@ static int imx_rproc_prepare(struct rproc *rproc) 
					   imx_rproc_mem_alloc, imx_rproc_mem_release,

					   imx_rproc_mem_alloc, imx_rproc_mem_release,

					   it.node->name);

					   it.node->name);





		if (mem)

		if (mem) {

			rproc_coredump_add_segment(rproc, da, rmem->size);

			rproc_coredump_add_segment(rproc, da, rmem->size);

		else

		} else {

			of_node_put(it.node);

			return -ENOMEM;

			return -ENOMEM;

		}





		rproc_add_carveout(rproc, mem);

		rproc_add_carveout(rproc, mem);

	}

	}