Skip to content

Commit

Permalink
remoteproc: imx_rproc: Call of_node_put() on iteration error
Browse files Browse the repository at this point in the history
commit 5ef074e 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: b29b424 ("remoteproc: imx_rproc: add i.MX specific parse fw hook")
Cc: stable@vger.kernel.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20230320221826.2728078-5-mathieu.poirier@linaro.org
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
mathieupoirier authored and gregkh committed May 17, 2023
1 parent fe3497c commit 948f81d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/remoteproc/imx_rproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,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;
}
Expand All @@ -472,10 +473,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);
}
Expand Down

0 comments on commit 948f81d

Please sign in to comment.