lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 385/849] media: mtk-vcodec: venc: fix return value when start_streaming fails
    Date
    From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>

    [ Upstream commit 065a7c66bd8b21db212fa86187ff12f0cac6ea6d ]

    In case vb2ops_venc_start_streaming fails, the error value
    is overwritten by the ret value of pm_runtime_put which might
    be 0. Fix it.

    Fixes: 985c73693fe5a (" media: mtk-vcodec: Separating mtk encoder driver")
    Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.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/mtk-vcodec/mtk_vcodec_enc.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    index 416f356af363d..d97a6765693f1 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
    @@ -793,7 +793,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
    {
    struct mtk_vcodec_ctx *ctx = vb2_get_drv_priv(q);
    struct venc_enc_param param;
    - int ret;
    + int ret, pm_ret;
    int i;

    /* Once state turn into MTK_STATE_ABORT, we need stop_streaming
    @@ -845,9 +845,9 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
    return 0;

    err_set_param:
    - ret = pm_runtime_put(&ctx->dev->plat_dev->dev);
    - if (ret < 0)
    - mtk_v4l2_err("pm_runtime_put fail %d", ret);
    + pm_ret = pm_runtime_put(&ctx->dev->plat_dev->dev);
    + if (pm_ret < 0)
    + mtk_v4l2_err("pm_runtime_put fail %d", pm_ret);

    err_start_stream:
    for (i = 0; i < q->num_buffers; ++i) {
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-15 23:55    [W:4.019 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site