Skip to content

Commit

Permalink
[media] cx25840: relax a Vsrc check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Dec 18, 2015
1 parent ee61cd9 commit 499ebed
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/media/i2c/cx25840/cx25840-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 499ebed

Please sign in to comment.