Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c166845c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 62f28725

drivers/media/v4l2-core/v4l2-dv-timings.c

+2 −1
Original line number Diff line number Diff line
@@ -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;