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 051/109] media: v4l2-dv-timings.c: fix wrong condition in two for-loops
    Date
    From: Hans Verkuil <hverkuil-cisco@xs4all.nl>

    [ Upstream commit 4108b3e6db31acc4c68133290bbcc87d4db905c9 ]

    These for-loops should test against v4l2_dv_timings_presets[i].bt.width,
    not if i < v4l2_dv_timings_presets[i].bt.width. Luckily nothing ever broke,
    since the smallest width is still a lot higher than the total number of
    presets, but it is wrong.

    The last item in the presets array is all 0, so the for-loop must stop
    when it reaches that sentinel.

    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Reported-by: Krzysztof Hałasa <khalasa@piap.pl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/v4l2-core/v4l2-dv-timings.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
    index 4f23e939ead0..60454e1b727e 100644
    --- a/drivers/media/v4l2-core/v4l2-dv-timings.c
    +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
    @@ -196,7 +196,7 @@ bool v4l2_find_dv_timings_cap(struct v4l2_dv_timings *t,
    if (!v4l2_valid_dv_timings(t, cap, fnc, fnc_handle))
    return false;

    - for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) {
    + for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) {
    if (v4l2_valid_dv_timings(v4l2_dv_timings_presets + i, cap,
    fnc, fnc_handle) &&
    v4l2_match_dv_timings(t, v4l2_dv_timings_presets + i,
    @@ -218,7 +218,7 @@ bool v4l2_find_dv_timings_cea861_vic(struct v4l2_dv_timings *t, u8 vic)
    {
    unsigned int i;

    - for (i = 0; i < v4l2_dv_timings_presets[i].bt.width; i++) {
    + for (i = 0; v4l2_dv_timings_presets[i].bt.width; i++) {
    const struct v4l2_bt_timings *bt =
    &v4l2_dv_timings_presets[i].bt;

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 15:01    [W:4.149 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site