Commit 5d1ca138 authored by Xiongfeng Wang's avatar Xiongfeng Wang Committed by Mauro Carvalho Chehab
Browse files

media: amphion: Add missing of_node_put() in vpu_core_parse_dt() 

of_parse_phandle() will increment the refcount of the returned
device_node. Calling of_node_put() to avoid the refcount leak.

Link: https://lore.kernel.org/linux-media/20220316081938.80819-1-wangxiongfeng2@huawei.com


Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 77119adb

drivers/media/platform/amphion/vpu_core.c

+8 −0
Original line number Diff line number Diff line
@@ -529,11 +529,14 @@ 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) {

		dev_err(core->dev, "rpc-region of_parse_phandle error\n");
@@ -541,6 +544,7 @@ 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;
@@ -549,6 +553,7 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np) 
	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",

			&core->rpc.phys, core->rpc.length);

		of_node_put(node);

		return -EINVAL;

	}
@@ -560,6 +565,7 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np) 
	if (ret != VPU_CORE_MEMORY_UNCACHED) {

		dev_err(core->dev, "rpc region<%pad, 0x%x> isn't uncached\n",

			&core->rpc.phys, core->rpc.length);

		of_node_put(node);

		return -EINVAL;

	}
@@ -571,6 +577,8 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np) 
	core->act.length = core->rpc.length - core->res->rpc_size - core->log.length;

	core->rpc.length = core->res->rpc_size;



	of_node_put(node);



	return 0;

}