UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: venus: venc: use pm_runtime_resume_and_get() 

Commit dd8088d5a8 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-04-23 17:19:19 +02:00
parent 1938ab0d27
commit 85368a213e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/qcom/venus/venc.c
View File

@ -1205,9 +1205,9 @@ static int venc_open(struct file *file)
venus_helper_init_instance(inst); venus_helper_init_instance(inst);
ret = pm_runtime_get_sync(core->dev_enc); ret = pm_runtime_resume_and_get(core->dev_enc);
if (ret < 0) if (ret < 0)
goto err_put_sync; goto err_free;
ret = venc_ctrl_init(inst); ret = venc_ctrl_init(inst);
if (ret) if (ret)
@ -1252,6 +1252,7 @@ err_ctrl_deinit:
venc_ctrl_deinit(inst); venc_ctrl_deinit(inst);
err_put_sync: err_put_sync:
pm_runtime_put_sync(core->dev_enc); pm_runtime_put_sync(core->dev_enc);
err_free:
kfree(inst); kfree(inst);
return ret; return ret;
} }