Commit e0e01de8 authored by Mathieu Poirier's avatar Mathieu Poirier
Browse files

remoteproc: imx_dsp_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: ec0e5549 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: default avatarShengjiu Wang <shengjiu.wang@gmail.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-6-mathieu.poirier@linaro.org


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

drivers/remoteproc/imx_dsp_rproc.c

+9 −3
Original line number Diff line number Diff line
@@ -650,15 +650,19 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) 


		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;

		}



		if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da))

		if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) {

			of_node_put(it.node);

			return -EINVAL;

		}



		cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size);

		if (!cpu_addr) {

			of_node_put(it.node);

			dev_err(dev, "failed to map memory %p\n", &rmem->base);

			return -ENOMEM;

		}
@@ -667,10 +671,12 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) 
		mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base,

					   rmem->size, da, NULL, NULL, it.node->name);



		if (mem)

		if (mem) {

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

		else

		} else {

			of_node_put(it.node);

			return -ENOMEM;

		}



		rproc_add_carveout(rproc, mem);

	}