[PATCH] media: amphion: Add missing of_node_put() in vpu_core_parse_dt

Lijun Fang posted 1 patch 4 years, 3 months ago
drivers/media/platform/amphion/vpu_core.c | 4 ++++
1 file changed, 4 insertions(+)
[PATCH] media: amphion: Add missing of_node_put() in vpu_core_parse_dt
Posted by Lijun Fang 4 years, 3 months ago
The device_node pointer is returned by of_parse_phandle()  with refcount
incremented. We should use of_node_put() on it when done.

Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
Signed-off-by: Lijun Fang <fanglijun3@huawei.com>
---
 drivers/media/platform/amphion/vpu_core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c
index 016554387f3f..74edc4abbdaa 100644
--- a/drivers/media/platform/amphion/vpu_core.c
+++ b/drivers/media/platform/amphion/vpu_core.c
@@ -529,10 +529,12 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)
 	}
 	if (of_address_to_resource(node, 0, &res)) {
 		dev_err(core->dev, "boot-region of_address_to_resource error\n");
+		of_node_put(node);
 		return -EINVAL;
 	}
 	core->fw.phys = res.start;
 	core->fw.length = resource_size(&res);
+	of_node_put(node);
 
 	node = of_parse_phandle(np, "memory-region", 1);
 	if (!node) {
@@ -541,10 +543,12 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)
 	}
 	if (of_address_to_resource(node, 0, &res)) {
 		dev_err(core->dev, "rpc-region of_address_to_resource error\n");
+		of_node_put(node);
 		return -EINVAL;
 	}
 	core->rpc.phys = res.start;
 	core->rpc.length = resource_size(&res);
+	of_node_put(node);
 
 	if (core->rpc.length < core->res->rpc_size + core->res->fwlog_size) {
 		dev_err(core->dev, "the rpc-region <%pad, 0x%x> is not enough\n",
-- 
2.17.1
RE: [PATCH] media: amphion: Add missing of_node_put() in vpu_core_parse_dt
Posted by Ming Qian 4 years, 3 months ago
> From: Lijun Fang [mailto:fanglijun3@huawei.com]
> Sent: Monday, March 14, 2022 2:10 PM
> To: linux-media@vger.kernel.org; linux-kernel@vger.kernel.org
> Cc: Ming Qian <ming.qian@nxp.com>; Shijie Qin <shijie.qin@nxp.com>; Eagle
> Zhou <eagle.zhou@nxp.com>; mchehab@kernel.org; hverkuil-cisco@xs4all.nl;
> xuqiang36@huawei.com
> Subject: [PATCH] media: amphion: Add missing of_node_put() in
> vpu_core_parse_dt
> 
> The device_node pointer is returned by of_parse_phandle()  with refcount
> incremented. We should use of_node_put() on it when done.
> 
> Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
> Signed-off-by: Lijun Fang <fanglijun3@huawei.com>

Reviewed-by: Ming Qian <ming.qian@nxp.com>

> ---
>  drivers/media/platform/amphion/vpu_core.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/media/platform/amphion/vpu_core.c
> b/drivers/media/platform/amphion/vpu_core.c
> index 016554387f3f..74edc4abbdaa 100644
> --- a/drivers/media/platform/amphion/vpu_core.c
> +++ b/drivers/media/platform/amphion/vpu_core.c
> @@ -529,10 +529,12 @@ static int vpu_core_parse_dt(struct vpu_core *core,
> struct device_node *np)
>  	}
>  	if (of_address_to_resource(node, 0, &res)) {
>  		dev_err(core->dev, "boot-region of_address_to_resource error\n");
> +		of_node_put(node);
>  		return -EINVAL;
>  	}
>  	core->fw.phys = res.start;
>  	core->fw.length = resource_size(&res);
> +	of_node_put(node);
> 
>  	node = of_parse_phandle(np, "memory-region", 1);
>  	if (!node) {
> @@ -541,10 +543,12 @@ static int vpu_core_parse_dt(struct vpu_core *core,
> struct device_node *np)
>  	}
>  	if (of_address_to_resource(node, 0, &res)) {
>  		dev_err(core->dev, "rpc-region of_address_to_resource error\n");
> +		of_node_put(node);
>  		return -EINVAL;
>  	}
>  	core->rpc.phys = res.start;
>  	core->rpc.length = resource_size(&res);
> +	of_node_put(node);
> 
>  	if (core->rpc.length < core->res->rpc_size + core->res->fwlog_size) {
>  		dev_err(core->dev, "the rpc-region <%pad, 0x%x> is not enough\n",
> --
> 2.17.1