lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 052/109] media: TDA1997x: fix tda1997x_query_dv_timings() return value
    Date
    From: Krzysztof Hałasa <khalasa@piap.pl>

    [ 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 | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
    index e43d8327b810..fc6cea5f3d3b 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 = {
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 15:01    [W:4.065 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site