Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb74335 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Greg Kroah-Hartman
Browse files

media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm() 



[ Upstream commit 8ea0f2ba0fa3f91ea1b8d823a54b042026ada6b3 ]

of_parse_phandle() returns the device node with refcount incremented.
There are two nodes that are used temporary in mtk_vcodec_init_enc_pm(),
but their refcounts are not decremented.

The patch adds one of_node_put() and fixes returning error codes.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 580d8b2f

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c

+6 −4
Original line number Diff line number Diff line
@@ -41,25 +41,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) 
	node = of_parse_phandle(dev->of_node, "mediatek,larb", 0);

	if (!node) {

		mtk_v4l2_err("no mediatek,larb found");

		return -1;

		return -ENODEV;

	}

	pdev = of_find_device_by_node(node);

	of_node_put(node);

	if (!pdev) {

		mtk_v4l2_err("no mediatek,larb device found");

		return -1;

		return -ENODEV;

	}

	pm->larbvenc = &pdev->dev;



	node = of_parse_phandle(dev->of_node, "mediatek,larb", 1);

	if (!node) {

		mtk_v4l2_err("no mediatek,larb found");

		return -1;

		return -ENODEV;

	}



	pdev = of_find_device_by_node(node);

	of_node_put(node);

	if (!pdev) {

		mtk_v4l2_err("no mediatek,larb device found");

		return -1;

		return -ENODEV;

	}



	pm->larbvenclt = &pdev->dev;