regmap: mmio: Allow passing an empty config->reg_stride

[linux.git] / drivers / remoteproc / imx_rproc.c

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 9fc978e0393cee92bae2bd4261bc26d8d292eb5d..0ab840dc7e97f7d4bac652f81f4af1fbf6f7d88e 100644 (file)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -541,6 +541,7 @@ static int imx_rproc_prepare(struct rproc *rproc)
 
                rmem = of_reserved_mem_lookup(it.node);
                if (!rmem) {
+                       of_node_put(it.node);
                        dev_err(priv->dev, "unable to acquire memory-region\n");
                        return -EINVAL;
                }
@@ -553,10 +554,12 @@ static int imx_rproc_prepare(struct rproc *rproc)
                                           imx_rproc_mem_alloc, imx_rproc_mem_release,
                                           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);
        }