Commit 8a749189 authored Mar 20, 2023 by Mathieu Poirier

remoteproc: st: 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: 3df52ed7 ("remoteproc: st: add reserved memory support")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-3-mathieu.poirier@linaro.org


Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

parent ccadca5b

drivers/remoteproc/st_remoteproc.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ static int st_rproc_parse_fw(struct rproc rproc, const struct firmware fw)
		while (of_phandle_iterator_next(&it) == 0) {
		rmem = of_reserved_mem_lookup(it.node);
		if (!rmem) {
		of_node_put(it.node);
		dev_err(dev, "unable to acquire memory-region\n");
		return -EINVAL;
		}
		@@ -150,8 +151,10 @@ static int st_rproc_parse_fw(struct rproc rproc, const struct firmware fw)
		it.node->name);
		}

		if (!mem)
		if (!mem) {
		of_node_put(it.node);
		return -ENOMEM;
		}

		rproc_add_carveout(rproc, mem);
		index++;