lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 556/633] media: venus: core: Fix runtime PM imbalance in venus_probe
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit bbe516e976fce538db96bd2b7287df942faa14a3 ]

    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. For other error
    paths after this call, things are the same.

    Fix this by adding pm_runtime_put_noidle() after 'err_runtime_disable'
    label. But in this case, the error path after pm_runtime_put_sync()
    will decrease PM usage counter twice. Thus add an extra
    pm_runtime_get_noresume() in this path to balance PM counter.

    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/qcom/venus/core.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
    index bfcaba37d60fe..321ad77cb6cf4 100644
    --- a/drivers/media/platform/qcom/venus/core.c
    +++ b/drivers/media/platform/qcom/venus/core.c
    @@ -289,8 +289,10 @@ static int venus_probe(struct platform_device *pdev)
    goto err_core_deinit;

    ret = pm_runtime_put_sync(dev);
    - if (ret)
    + if (ret) {
    + pm_runtime_get_noresume(dev);
    goto err_dev_unregister;
    + }

    return 0;

    @@ -301,6 +303,7 @@ static int venus_probe(struct platform_device *pdev)
    err_venus_shutdown:
    venus_shutdown(core);
    err_runtime_disable:
    + pm_runtime_put_noidle(dev);
    pm_runtime_set_suspended(dev);
    pm_runtime_disable(dev);
    hfi_destroy(core);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:40    [W:4.145 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site