[PATCH 4/5] remoteproc: imx_rproc: Call of_node_put() on iteration error

Peng Fan peng.fan at nxp.com
Mon Mar 20 20:00:02 PDT 2023


> Subject: [PATCH 4/5] remoteproc: imx_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: b29b4249f8f0 ("remoteproc: imx_rproc: add i.MX specific parse fw
> hook")
> Cc: stable at vger.kernel.org
> Signed-off-by: Mathieu Poirier <mathieu.poirier at linaro.org>

LGTM:
Reviewed-by: Peng Fan <peng.fan at nxp.com>

> ---
>  drivers/remoteproc/imx_rproc.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/remoteproc/imx_rproc.c
> b/drivers/remoteproc/imx_rproc.c index 9fc978e0393c..0ab840dc7e97
> 100644
> --- 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);
>  	}
> --
> 2.25.1




More information about the linux-arm-kernel mailing list