lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 126/717] media: staging: rkisp1: cap: fix runtime PM imbalance on error
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 4cbbe2aaa0536b0e7b3dfbd7febc3bc2ec300559 ]

    pm_runtime_get_sync will increment pm usage counter even it
    failed. Forgetting to pm_runtime_put_noidle will result in
    reference imbalance in rkisp1_vb2_start_streaming, so we
    should fix it.

    Fixes: 56e3b29f9f6b2 ("media: staging: rkisp1: add streaming paths")
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.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/staging/media/rkisp1/rkisp1-capture.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
    index b6f497ce3e95c..0c934ca5adaa3 100644
    --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
    +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
    @@ -992,6 +992,7 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)

    ret = pm_runtime_get_sync(cap->rkisp1->dev);
    if (ret < 0) {
    + pm_runtime_put_noidle(cap->rkisp1->dev);
    dev_err(cap->rkisp1->dev, "power up failed %d\n", ret);
    goto err_destroy_dummy;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:10    [W:3.600 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site