Commit 5d4fa2c5 authored by Yu Kuai's avatar Yu Kuai Committed by Mauro Carvalho Chehab

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

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

Fixes: 590577a4 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder 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>
parent f28a81a3
...@@ -47,11 +47,14 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) ...@@ -47,11 +47,14 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
dec_clk->clk_info = devm_kcalloc(&pdev->dev, dec_clk->clk_info = devm_kcalloc(&pdev->dev,
dec_clk->clk_num, sizeof(*clk_info), dec_clk->clk_num, sizeof(*clk_info),
GFP_KERNEL); GFP_KERNEL);
if (!dec_clk->clk_info) if (!dec_clk->clk_info) {
return -ENOMEM; ret = -ENOMEM;
goto put_device;
}
} else { } else {
mtk_v4l2_err("Failed to get vdec clock count"); mtk_v4l2_err("Failed to get vdec clock count");
return -EINVAL; ret = -EINVAL;
goto put_device;
} }
for (i = 0; i < dec_clk->clk_num; i++) { for (i = 0; i < dec_clk->clk_num; i++) {
...@@ -60,19 +63,22 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) ...@@ -60,19 +63,22 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
"clock-names", i, &clk_info->clk_name); "clock-names", i, &clk_info->clk_name);
if (ret) { if (ret) {
mtk_v4l2_err("Failed to get clock name id = %d", i); mtk_v4l2_err("Failed to get clock name id = %d", i);
return ret; goto put_device;
} }
clk_info->vcodec_clk = devm_clk_get(&pdev->dev, clk_info->vcodec_clk = devm_clk_get(&pdev->dev,
clk_info->clk_name); clk_info->clk_name);
if (IS_ERR(clk_info->vcodec_clk)) { if (IS_ERR(clk_info->vcodec_clk)) {
mtk_v4l2_err("devm_clk_get (%d)%s fail", i, mtk_v4l2_err("devm_clk_get (%d)%s fail", i,
clk_info->clk_name); clk_info->clk_name);
return PTR_ERR(clk_info->vcodec_clk); ret = PTR_ERR(clk_info->vcodec_clk);
goto put_device;
} }
} }
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
return 0;
put_device:
put_device(pm->larbvdec);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment