diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-03-10 01:19:13 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-20 16:39:02 +0100 |
| commit | 7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555 (patch) | |
| tree | f4f31544afe500a2ce10bc0b4e4ad0d7edc806a8 /drivers/media/video/tvp5150.c | |
| parent | V4L/DVB (7334): usb video: add a device link to usbvideo devices, else hal wi... (diff) | |
| download | linux-7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555.tar.xz linux-7d5b7b98ae4cbf4c58d143ff7d4516c978e3e555.zip | |
V4L/DVB (7362): tvp5150.c: logical-bitwise and confusion
logical-bitwise & confusion
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tvp5150.c')
| -rw-r--r-- | drivers/media/video/tvp5150.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 445eba4174d7..d28318cb2b8d 100644 --- a/drivers/media/video/tvp5150.c +++ b/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; } |