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 543/633] media: bdisp: Fix runtime PM imbalance on error
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit dbd2f2dc025f9be8ae063e4f270099677238f620 ]

    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>
    Reviewed-by: Fabien Dessenne <fabien.dessenne@st.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    index af2d5eb782cee..e1d150584bdc2 100644
    --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    @@ -1371,7 +1371,7 @@ static int bdisp_probe(struct platform_device *pdev)
    ret = pm_runtime_get_sync(dev);
    if (ret < 0) {
    dev_err(dev, "failed to set PM\n");
    - goto err_dbg;
    + goto err_pm;
    }

    /* Filters */
    @@ -1399,7 +1399,6 @@ static int bdisp_probe(struct platform_device *pdev)
    bdisp_hw_free_filters(bdisp->dev);
    err_pm:
    pm_runtime_put(dev);
    -err_dbg:
    bdisp_debugfs_remove(bdisp);
    err_v4l2:
    v4l2_device_unregister(&bdisp->v4l2_dev);
    --
    2.25.1


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