diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-04-23 18:19:19 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-05-19 10:51:43 +0300 |
| commit | 85368a213e2dc0f4956e9d23daa39c4a339861e1 (patch) | |
| tree | bdc7a5f2ee34e9e0894a6dafd7e06f8a3dfdf1f3 /drivers/media/platform/qcom/venus/venc.c | |
| parent | 1938ab0d271ffb6f0c9efa2873a53642167fe57c (diff) | |
| download | linux-85368a213e2dc0f4956e9d23daa39c4a339861e1.tar.xz | |
media: venus: venc: use pm_runtime_resume_and_get()
Commit dd8088d5a896 ("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>
Diffstat (limited to 'drivers/media/platform/qcom/venus/venc.c')
| -rw-r--r-- | drivers/media/platform/qcom/venus/venc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 4a7291f934b6..8dd49d4f124c 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1205,9 +1205,9 @@ static int venc_open(struct file *file) 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) - goto err_put_sync; + goto err_free; ret = venc_ctrl_init(inst); if (ret) @@ -1252,6 +1252,7 @@ err_ctrl_deinit: venc_ctrl_deinit(inst); err_put_sync: pm_runtime_put_sync(core->dev_enc); +err_free: kfree(inst); return ret; } |