xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: 3003a180ef ("[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>
This commit is contained in:
Christophe JAILLET
2021-08-19 22:21:25 +02:00
committed by Greg Kroah-Hartman
parent e43b301cb1
commit 4280b30ea9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@@ -820,7 +820,8 @@ static int mtk_vpu_probe(struct platform_device *pdev)
vpu->wdt.wq = create_singlethread_workqueue("vpu_wdt"); vpu->wdt.wq = create_singlethread_workqueue("vpu_wdt");
if (!vpu->wdt.wq) { if (!vpu->wdt.wq) {
dev_err(dev, "initialize wdt workqueue failed\n"); dev_err(dev, "initialize wdt workqueue failed\n");
return -ENOMEM; ret = -ENOMEM;
goto clk_unprepare;
} }
INIT_WORK(&vpu->wdt.ws, vpu_wdt_reset_func); INIT_WORK(&vpu->wdt.ws, vpu_wdt_reset_func);
mutex_init(&vpu->vpu_mutex); mutex_init(&vpu->vpu_mutex);
@@ -914,6 +915,8 @@ disable_vpu_clk:
vpu_clock_disable(vpu); vpu_clock_disable(vpu);
workqueue_destroy: workqueue_destroy:
destroy_workqueue(vpu->wdt.wq); destroy_workqueue(vpu->wdt.wq);
clk_unprepare:
clk_unprepare(vpu->clk);
return ret; return ret;
} }