[media] v4l2-dv-timings: only check standards if non-zero

If one or both of the timings being compared have the standards field
with value 0, then accept that. Only check for matching standards if
both timings have actually filled in that field.

Otherwise no match will ever be found since when timings are detected
the standards field will typically be set to 0 by the driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
index ce1c9f5d9dee..b1d8dbb39665 100644
--- a/drivers/media/v4l2-core/v4l2-dv-timings.c
+++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -164,7 +164,8 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t,
             bt->width > cap->max_width ||
             bt->pixelclock < cap->min_pixelclock ||
             bt->pixelclock > cap->max_pixelclock ||
-            (cap->standards && !(bt->standards & cap->standards)) ||
+            (cap->standards && bt->standards &&
+             !(bt->standards & cap->standards)) ||
             (bt->interlaced && !(caps & V4L2_DV_BT_CAP_INTERLACED)) ||
             (!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE)))
                 return false;