Commit f8bae637 authored by Mathieu Poirier's avatar Mathieu Poirier

remoteproc: rcar_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: 285892a7 ("remoteproc: Add Renesas rcar driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20230320221826.2728078-4-mathieu.poirier@linaro.orgSigned-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 8a749189
...@@ -62,13 +62,16 @@ static int rcar_rproc_prepare(struct rproc *rproc) ...@@ -62,13 +62,16 @@ static int rcar_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(&rproc->dev, dev_err(&rproc->dev,
"unable to acquire memory-region\n"); "unable to acquire memory-region\n");
return -EINVAL; return -EINVAL;
} }
if (rmem->base > U32_MAX) if (rmem->base > U32_MAX) {
of_node_put(it.node);
return -EINVAL; return -EINVAL;
}
/* No need to translate pa to da, R-Car use same map */ /* No need to translate pa to da, R-Car use same map */
da = rmem->base; da = rmem->base;
...@@ -79,8 +82,10 @@ static int rcar_rproc_prepare(struct rproc *rproc) ...@@ -79,8 +82,10 @@ static int rcar_rproc_prepare(struct rproc *rproc)
rcar_rproc_mem_release, rcar_rproc_mem_release,
it.node->name); it.node->name);
if (!mem) if (!mem) {
of_node_put(it.node);
return -ENOMEM; return -ENOMEM;
}
rproc_add_carveout(rproc, mem); rproc_add_carveout(rproc, mem);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment