lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 039/134] media: qm1d1c0042: fix error return code in qm1d1c0042_init()
    Date
    From: Luo Meng <luomeng12@huawei.com>

    [ Upstream commit fcf8d018bdca0453b8d6359062e6bc1512d04c38 ]

    Fix to return a negative error code from the error handling case
    instead of 0 in function qm1d1c0042_init(), as done elsewhere
    in this function.

    Fixes: ab4d14528fdf ("[media] em28xx: add support for PLEX PX-BCUD (ISDB-S)")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Luo Meng <luomeng12@huawei.com>
    Acked-by: Akihiro Tsukada <tskd08@gmail.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/tuners/qm1d1c0042.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/tuners/qm1d1c0042.c b/drivers/media/tuners/qm1d1c0042.c
    index 9af2a155cfca9..416d1eeb9c029 100644
    --- a/drivers/media/tuners/qm1d1c0042.c
    +++ b/drivers/media/tuners/qm1d1c0042.c
    @@ -352,8 +352,10 @@ static int qm1d1c0042_init(struct dvb_frontend *fe)
    if (val == reg_initval[reg_index][0x00])
    break;
    }
    - if (reg_index >= QM1D1C0042_NUM_REG_ROWS)
    + if (reg_index >= QM1D1C0042_NUM_REG_ROWS) {
    + ret = -EINVAL;
    goto failed;
    + }
    memcpy(state->regs, reg_initval[reg_index], QM1D1C0042_NUM_REGS);
    usleep_range(2000, 3000);

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-01 18:53    [W:2.962 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site