From e84ab466c47b9a733a416da955760eb1843e4982 Mon Sep 17 00:00:00 2001 From: Roel Kluin <12o3l@tiscali.nl> Date: Sun, 9 Mar 2008 21:19:13 -0300 Subject: [PATCH] --- yaml --- r: 87543 b: refs/heads/master c: 7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555 h: refs/heads/master i: 87541: 29c34ade1a3417226e7a4db06475a842d26eaf06 87539: a299e33ef387058e45ac2c39a28b4545deea97ac 87535: 6c85178cc6215808046fcf476590c1956e40f751 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tvp5150.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f05f849d32c..cb196f18873c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 974a911d2ae310d7082100e9992d1efdf72d86a5 +refs/heads/master: 7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555 diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c index 445eba4174d7..d28318cb2b8d 100644 --- a/trunk/drivers/media/video/tvp5150.c +++ b/trunk/drivers/media/video/tvp5150.c @@ -672,7 +672,7 @@ static int tvp5150_set_vbi(struct i2c_client *c, if (std == V4L2_STD_ALL) { tvp5150_err("VBI can't be configured without knowing number of lines\n"); return 0; - } else if (std && V4L2_STD_625_50) { + } else if (std & V4L2_STD_625_50) { /* Don't follow NTSC Line number convension */ line += 3; } @@ -719,7 +719,7 @@ static int tvp5150_get_vbi(struct i2c_client *c, if (std == V4L2_STD_ALL) { tvp5150_err("VBI can't be configured without knowing number of lines\n"); return 0; - } else if (std && V4L2_STD_625_50) { + } else if (std & V4L2_STD_625_50) { /* Don't follow NTSC Line number convension */ line += 3; }