]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: TDA1997x: fix tda1997x_query_dv_timings() return value
authorKrzysztof Hałasa <khalasa@piap.pl>
Mon, 26 Jul 2021 10:46:28 +0000 (12:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 18 Sep 2021 11:42:07 +0000 (13:42 +0200)
[ Upstream commit 7dee1030871a48d4f3c5a74227a4b4188463479a ]

Correctly propagate the tda1997x_detect_std error value.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
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/i2c/tda1997x.c

index 9554c8348c0203d5df056f7bf28b26b9cef4429b..17cc69c3227f8655200beaeaa92b465830b53e88 100644 (file)
@@ -1695,14 +1695,15 @@ static int tda1997x_query_dv_timings(struct v4l2_subdev *sd,
                                     struct v4l2_dv_timings *timings)
 {
        struct tda1997x_state *state = to_state(sd);
+       int ret;
 
        v4l_dbg(1, debug, state->client, "%s\n", __func__);
        memset(timings, 0, sizeof(struct v4l2_dv_timings));
        mutex_lock(&state->lock);
-       tda1997x_detect_std(state, timings);
+       ret = tda1997x_detect_std(state, timings);
        mutex_unlock(&state->lock);
 
-       return 0;
+       return ret;
 }
 
 static const struct v4l2_subdev_video_ops tda1997x_video_ops = {