[media] cx25840: relax a Vsrc check

The cx23888 reports a slightly different Vsrc value than the other
chip variants do. Relax the check by 1, otherwise cx25840_set_fmt()
would fail for the cx23888.

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

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index a741c30a9a0ea84b9a17363f933fdfab3977d198..d8b5343cb80abf8f868bec08aa2fd2f20e09ae3e 100644 (file)
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -1390,8 +1390,14 @@ static int cx25840_set_fmt(struct v4l2_subdev *sd,
 
        Vlines = fmt->height + (is_50Hz ? 4 : 7);
 
+       /*
+        * We keep 1 margin for the Vsrc < Vlines check since the
+        * cx23888 reports a Vsrc of 486 instead of 487 for the NTSC
+        * height. Without that margin the cx23885 fails in this
+        * check.
+        */
        if ((fmt->width * 16 < Hsrc) || (Hsrc < fmt->width) ||
-                       (Vlines * 8 < Vsrc) || (Vsrc < Vlines)) {
+                       (Vlines * 8 < Vsrc) || (Vsrc + 1 < Vlines)) {
                v4l_err(client, "%dx%d is not a valid size!\n",
                                fmt->width, fmt->height);
                return -ERANGE;