]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: qm1d1c0042: fix error return code in qm1d1c0042_init()
authorLuo Meng <luomeng12@huawei.com>
Wed, 25 Nov 2020 01:34:37 +0000 (02:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Mar 2021 16:44:35 +0000 (17:44 +0100)
[ 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

index 9af2a155cfca91749db6a635e86ff2b908980313..416d1eeb9c0297f2b435c6a1a43793e9638f1b5b 100644 (file)
@@ -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);