diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-01-12 07:40:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 07:40:50 -0300 |
| commit | 712fcc850e5a6d0867b0d97a0b79f1addd01998f (patch) | |
| tree | d092452bebc70059ffa9f913a1daea74d656300e /drivers/media/platform/mtk-vpu/mtk_vpu.c | |
| parent | e99f775ed2f46b225106f0a156116a0080d16740 (diff) | |
| parent | 0156d956a951c70743d2338132662b29aeb8847d (diff) | |
Merge pull request #517 from denisdrozdov/5.4-2.3.x-imx
Merge tag 'v5.4.161' into 5.4-2.3.x-imx
Diffstat (limited to 'drivers/media/platform/mtk-vpu/mtk_vpu.c')
| -rw-r--r-- | drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c index cc2ff40d060d..acf64723f938 100644 --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c @@ -809,7 +809,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); @@ -908,6 +909,8 @@ disable_vpu_clk: vpu_clock_disable(vpu); workqueue_destroy: destroy_workqueue(vpu->wdt.wq); +clk_unprepare: + clk_unprepare(vpu->clk); return ret; } |