media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Thu, 19 Aug 2021 20:21:25 +0000 (22:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 10:40:29 +0000 (11:40 +0100)
[ 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>
drivers/media/platform/mtk-vpu/mtk_vpu.c

index 853d598937f69d4667ce5a28d078e53365c2b134..019a5e7e1a402e5fed20cb127f61df8f67c9dfd9 100644 (file)
@@ -817,7 +817,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);
@@ -916,6 +917,8 @@ disable_vpu_clk:
        vpu_clock_disable(vpu);
 workqueue_destroy:
        destroy_workqueue(vpu->wdt.wq);
+clk_unprepare:
+       clk_unprepare(vpu->clk);
 
        return ret;
 }