media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'

BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit 2143ad413c05c7be24c3a92760e367b7f6aaac92 ]

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>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index ec290dde59cfdac9182fde6e3d3ee9030aa554bc..7f1647da0ade0eb48e6f357bc710c2974eb6323b 100644 (file)
--- 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 @@ disable_vpu_clk:
        vpu_clock_disable(vpu);
 workqueue_destroy:
        destroy_workqueue(vpu->wdt.wq);
+clk_unprepare:
+       clk_unprepare(vpu->clk);
 
        return ret;
 }