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

Commit d8d35c1e authored by Yu Kuai's avatar Yu Kuai Committed by Greg Kroah-Hartman
Browse files

media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_enc_pm() 



[ Upstream commit 4affafd7bec7c65da31777f18bd20420f1aeb5f8 ]

if of_find_device_by_node() succeed, mtk_vcodec_init_enc_pm() doesn't have
a corresponding put_device(). Thus add jump target to fix the exception
handling for this function implementation.

Fixes: 4e855a6e ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver")
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c8adf580

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

+19 −7
Original line number Diff line number Diff line
@@ -49,14 +49,16 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) 
	node = of_parse_phandle(dev->of_node, "mediatek,larb", 1);

	if (!node) {

		mtk_v4l2_err("no mediatek,larb found");

		return -ENODEV;

		ret = -ENODEV;

		goto put_larbvenc;

	}



	pdev = of_find_device_by_node(node);

	of_node_put(node);

	if (!pdev) {

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

		return -ENODEV;

		ret = -ENODEV;

		goto put_larbvenc;

	}



	pm->larbvenclt = &pdev->dev;
@@ -69,11 +71,14 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) 
		enc_clk->clk_info = devm_kcalloc(&pdev->dev,

			enc_clk->clk_num, sizeof(*clk_info),

			GFP_KERNEL);

		if (!enc_clk->clk_info)

			return -ENOMEM;

		if (!enc_clk->clk_info) {

			ret = -ENOMEM;

			goto put_larbvenclt;

		}

	} else {

		mtk_v4l2_err("Failed to get venc clock count");

		return -EINVAL;

		ret = -EINVAL;

		goto put_larbvenclt;

	}



	for (i = 0; i < enc_clk->clk_num; i++) {
@@ -82,17 +87,24 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) 
			"clock-names", i, &clk_info->clk_name);

		if (ret) {

			mtk_v4l2_err("venc failed to get clk name %d", i);

			return ret;

			goto put_larbvenclt;

		}

		clk_info->vcodec_clk = devm_clk_get(&pdev->dev,

			clk_info->clk_name);

		if (IS_ERR(clk_info->vcodec_clk)) {

			mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i,

				clk_info->clk_name);

			return PTR_ERR(clk_info->vcodec_clk);

			ret = PTR_ERR(clk_info->vcodec_clk);

			goto put_larbvenclt;

		}

	}



	return 0;



put_larbvenclt:

	put_device(pm->larbvenclt);

put_larbvenc:

	put_device(pm->larbvenc);

	return ret;

}