diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-09 21:19:13 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-09 21:19:13 +0000 |
| commit | 61ac20c4d5ef8f2206a30ead4e4a97c7805f7853 (patch) | |
| tree | aa0a6be20ad664407d44c96f5d679369c64126eb /linux/drivers | |
| parent | cafc731a90a72a074c05cf2d7e4a67f3fa596b76 (diff) | |
| download | mediapointer-dvb-s2-61ac20c4d5ef8f2206a30ead4e4a97c7805f7853.tar.gz mediapointer-dvb-s2-61ac20c4d5ef8f2206a30ead4e4a97c7805f7853.tar.bz2 | |
tvp5150.c: logical-bitwise and confusion
From: Roel Kluin <12o3l@tiscali.nl>
logical-bitwise & confusion
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/tvp5150.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index 22fce5d1e..e6907db8b 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -709,7 +709,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; } @@ -756,7 +756,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; } |