* [PATCH 2/3] media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_dec_pm()
@ 2020-09-24 8:18 Yu Kuai
2020-10-03 11:19 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Yu Kuai @ 2020-09-24 8:18 UTC (permalink / raw)
To: tiffany.lin, andrew-ct.chen, mchehab, matthias.bgg, hans.verkuil
Cc: yi.zhang, linux-kernel, linux-mediatek, yukuai3,
linux-arm-kernel, linux-media
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: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
.../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index 5a6ec8fb52da..01e680ede9bd 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -48,11 +48,14 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
dec_clk->clk_info = devm_kcalloc(&pdev->dev,
dec_clk->clk_num, sizeof(*clk_info),
GFP_KERNEL);
- if (!dec_clk->clk_info)
- return -ENOMEM;
+ if (!dec_clk->clk_info) {
+ ret = -ENOMEM;
+ goto put_device;
+ }
} else {
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++) {
@@ -61,19 +64,22 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
"clock-names", i, &clk_info->clk_name);
if (ret) {
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->clk_name);
if (IS_ERR(clk_info->vcodec_clk)) {
mtk_v4l2_err("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_device;
}
}
pm_runtime_enable(&pdev->dev);
-
+ return 0;
+put_device:
+ put_device(pm->larbvdec);
return ret;
}
--
2.25.4
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/3] media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_dec_pm()
2020-09-24 8:18 [PATCH 2/3] media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_dec_pm() Yu Kuai
@ 2020-10-03 11:19 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2020-10-03 11:19 UTC (permalink / raw)
To: Yu Kuai, tiffany.lin, andrew-ct.chen, mchehab, matthias.bgg
Cc: yi.zhang, linux-mediatek, linux-kernel, linux-arm-kernel, linux-media
On 24/09/2020 10:18, Yu Kuai wrote:
> 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: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> index 5a6ec8fb52da..01e680ede9bd 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> @@ -48,11 +48,14 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> dec_clk->clk_info = devm_kcalloc(&pdev->dev,
> dec_clk->clk_num, sizeof(*clk_info),
> GFP_KERNEL);
> - if (!dec_clk->clk_info)
> - return -ENOMEM;
> + if (!dec_clk->clk_info) {
> + ret = -ENOMEM;
> + goto put_device;
> + }
> } else {
> 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++) {
> @@ -61,19 +64,22 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev)
> "clock-names", i, &clk_info->clk_name);
> if (ret) {
> 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->clk_name);
> if (IS_ERR(clk_info->vcodec_clk)) {
> mtk_v4l2_err("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_device;
> }
> }
>
> pm_runtime_enable(&pdev->dev);
> -
> + return 0;
> +put_device:
> + put_device(pm->larbvdec);
> return ret;
> }
>
>
A similar question as with the previous patch: shouldn't there be a
put_device(pm->larbvdec); in the mtk_vcodec_release_dec_pm() function?
Same for the next patch.
Regards,
Hans
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-03 11:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-24 8:18 [PATCH 2/3] media: mtk-vcodec: add missing put_device() call in mtk_vcodec_init_dec_pm() Yu Kuai
2020-10-03 11:19 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).