LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'
@ 2021-08-19 20:21 Christophe JAILLET
  2021-08-19 23:20 ` houlong wei
  0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2021-08-19 20:21 UTC (permalink / raw)
  To: minghsiu.tsai, houlong.wei, andrew-ct.chen, tiffany.lin, mchehab,
	matthias.bgg, hans.verkuil
  Cc: linux-media, linux-mediatek, linux-arm-kernel, linux-kernel,
	kernel-janitors, Christophe JAILLET

A successful 'clk_prepare()' call should be balanced by a corresponding
'clk_unprepare()' call in the error handling path of the probe, as already
done in the remove function.

Update the error handling path accordingly.

Fixes: 3003a180ef6b ("[media] VPU: mediatek: support Mediatek VPU")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index ec290dde59cf..7f1647da0ade 100644
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -848,7 +848,8 @@ static int mtk_vpu_probe(struct platform_device *pdev)
 	vpu->wdt.wq = create_singlethread_workqueue("vpu_wdt");
 	if (!vpu->wdt.wq) {
 		dev_err(dev, "initialize wdt workqueue failed\n");
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto clk_unprepare;
 	}
 	INIT_WORK(&vpu->wdt.ws, vpu_wdt_reset_func);
 	mutex_init(&vpu->vpu_mutex);
@@ -942,6 +943,8 @@ static int mtk_vpu_probe(struct platform_device *pdev)
 	vpu_clock_disable(vpu);
 workqueue_destroy:
 	destroy_workqueue(vpu->wdt.wq);
+clk_unprepare:
+	clk_unprepare(vpu->clk);
 
 	return ret;
 }
-- 
2.30.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'
  2021-08-19 20:21 [PATCH] media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' Christophe JAILLET
@ 2021-08-19 23:20 ` houlong wei
  0 siblings, 0 replies; 2+ messages in thread
From: houlong wei @ 2021-08-19 23:20 UTC (permalink / raw)
  To: Christophe JAILLET, Minghsiu Tsai (蔡明修),
	Andrew-CT Chen (陳智迪),
	Tiffany Lin (林慧珊),
	mchehab, matthias.bgg, hans.verkuil
  Cc: linux-media, linux-mediatek, linux-arm-kernel, linux-kernel,
	kernel-janitors, houlong.wei

On Fri, 2021-08-20 at 04:21 +0800, Christophe JAILLET wrote:
> A successful 'clk_prepare()' call should be balanced by a
> corresponding
> 'clk_unprepare()' call in the error handling path of the probe, as
> already
> done in the remove function.
> 
> Update the error handling path accordingly.
> 
> Fixes: 3003a180ef6b ("[media] VPU: mediatek: support Mediatek VPU")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> 
Reviewed-by: Houlong Wei <houlong.wei@mediatek.com>

>  drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c
> b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> index ec290dde59cf..7f1647da0ade 100644
> --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
> +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
> @@ -848,7 +848,8 @@ static int mtk_vpu_probe(struct platform_device
> *pdev)
>  	vpu->wdt.wq = create_singlethread_workqueue("vpu_wdt");
>  	if (!vpu->wdt.wq) {
>  		dev_err(dev, "initialize wdt workqueue failed\n");
> -		return -ENOMEM;
> +		ret = -ENOMEM;
> +		goto clk_unprepare;
>  	}
>  	INIT_WORK(&vpu->wdt.ws, vpu_wdt_reset_func);
>  	mutex_init(&vpu->vpu_mutex);
> @@ -942,6 +943,8 @@ static int mtk_vpu_probe(struct platform_device
> *pdev)
>  	vpu_clock_disable(vpu);
>  workqueue_destroy:
>  	destroy_workqueue(vpu->wdt.wq);
> +clk_unprepare:
> +	clk_unprepare(vpu->clk);
>  
>  	return ret;
>  }
> -- 
> 2.30.2
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-19 23:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-19 20:21 [PATCH] media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' Christophe JAILLET
2021-08-19 23:20 ` houlong wei

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).