| Message ID | 3d4ba5d254044567653a006b18971658ec69560f.1629404378.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | Accepted |
| Commit | 2143ad413c05c7be24c3a92760e367b7f6aaac92 |
| Headers | show |
| Series | media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' | expand |
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 >
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; }
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(-)