openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: coda: Fix runtime PM imbalance on error 

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dinghao Liu 2020-05-21 12:17:35 +02:00 committed by Mauro Carvalho Chehab
parent e40a8770fd
commit 90361693ad
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/coda/coda-common.c
View File

@ -2653,7 +2653,7 @@ static int coda_open(struct file *file)
ret = clk_prepare_enable(dev->clk_per); ret = clk_prepare_enable(dev->clk_per);
if (ret) if (ret)
goto err_clk_per; goto err_pm_get;
ret = clk_prepare_enable(dev->clk_ahb); ret = clk_prepare_enable(dev->clk_ahb);
if (ret) if (ret)
@ -2692,9 +2692,8 @@ static int coda_open(struct file *file)
clk_disable_unprepare(dev->clk_ahb); clk_disable_unprepare(dev->clk_ahb);
err_clk_ahb: err_clk_ahb:
clk_disable_unprepare(dev->clk_per); clk_disable_unprepare(dev->clk_per);
err_clk_per:
pm_runtime_put_sync(dev->dev);
err_pm_get: err_pm_get:
pm_runtime_put_sync(dev->dev);
v4l2_fh_del(&ctx->fh); v4l2_fh_del(&ctx->fh);
v4l2_fh_exit(&ctx->fh); v4l2_fh_exit(&ctx->fh);
err_coda_name_init: err_coda_name_init: