| Message ID | 20200524043132.32758-1-dinghao.liu@zju.edu.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 831b8755fd2f60cf00cbf854c2a2eccb03f2060b |
| Headers | show |
| Series | media: venus: venc: Fix runtime PM imbalance in venc_open | expand |
Hi Dinghao, Thanks for the patch! On 5/24/20 7:31 AM, Dinghao Liu wrote: > 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> > --- > drivers/media/platform/qcom/venus/venc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> > > diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c > index 9981a2a27c90..eefcfbb8f211 100644 > --- a/drivers/media/platform/qcom/venus/venc.c > +++ b/drivers/media/platform/qcom/venus/venc.c > @@ -1169,7 +1169,7 @@ static int venc_open(struct file *file) > > ret = pm_runtime_get_sync(core->dev_enc); > if (ret < 0) > - goto err_free_inst; > + goto err_put_sync; > > ret = venc_ctrl_init(inst); > if (ret) > @@ -1214,7 +1214,6 @@ static int venc_open(struct file *file) > venc_ctrl_deinit(inst); > err_put_sync: > pm_runtime_put_sync(core->dev_enc); > -err_free_inst: > kfree(inst); > return ret; > } >
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 9981a2a27c90..eefcfbb8f211 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1169,7 +1169,7 @@ static int venc_open(struct file *file) ret = pm_runtime_get_sync(core->dev_enc); if (ret < 0) - goto err_free_inst; + goto err_put_sync; ret = venc_ctrl_init(inst); if (ret) @@ -1214,7 +1214,6 @@ static int venc_open(struct file *file) venc_ctrl_deinit(inst); err_put_sync: pm_runtime_put_sync(core->dev_enc); -err_free_inst: kfree(inst); return ret; }
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> --- drivers/media/platform/qcom/venus/venc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)