remoteproc: imx_dsp_rproc: Call of_node_put() on iteration error

commit e0e01de8ee146986872e54e8365f4b4654819412 upstream.

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: ec0e5549f358 ("remoteproc: imx_dsp_rproc: Add remoteproc driver for DSP on i.MX")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-6-mathieu.poirier@linaro.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 95da1cbefacf0b1c747d19497d7f7c0ce1b64292..506ec9565716b41e1fa60e420fa1702b0b41077e 100644 (file)
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -627,15 +627,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;
                }
@@ -644,10 +648,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);
        }