aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/tda1997x.c
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khalasa@piap.pl>2021-07-26 12:46:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-18 13:40:25 +0200
commitc159db240cf27af29f4e4e747c8bd60faa5e34fa (patch)
tree72848310b7577e8e2214e9215be0763cdf42caf4 /drivers/media/i2c/tda1997x.c
parente3a2e20ed5037e668df4522575fd09a2b87263c3 (diff)
downloadkernel_replicant_linux-c159db240cf27af29f4e4e747c8bd60faa5e34fa.tar.gz
kernel_replicant_linux-c159db240cf27af29f4e4e747c8bd60faa5e34fa.tar.bz2
kernel_replicant_linux-c159db240cf27af29f4e4e747c8bd60faa5e34fa.zip
media: TDA1997x: fix tda1997x_query_dv_timings() return value
[ 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>
Diffstat (limited to 'drivers/media/i2c/tda1997x.c')
-rw-r--r--drivers/media/i2c/tda1997x.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
index 9554c8348c02..17cc69c3227f 100644
--- a/drivers/media/i2c/tda1997x.c
+++ b/drivers/media/i2c/tda1997x.c
@@ -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 = {