summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-12-10 09:39:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:17:03 -0200
commit2a72b39e516bf772e707d5a080d5d07b1c8ac0c0 (patch)
treefcae2ef48e893ccd390f9211af2b7b4c16e26a3a /drivers/media
parent75aecc3af22ae9063c96457d530f281a1e2d3276 (diff)
[media] zoran: bit-wise vs logical and
zr->frame_num is a counter and && was intended here instead of &. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/zoran/zoran_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index b02007e4215..e8a27844bf3 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -1523,7 +1523,7 @@ zoran_irq (int irq,
zr->JPEG_missed > 25 ||
zr->JPEG_error == 1 ||
((zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS) &&
- (zr->frame_num & (zr->JPEG_missed > zr->jpg_settings.field_per_buff)))) {
+ (zr->frame_num && (zr->JPEG_missed > zr->jpg_settings.field_per_buff)))) {
error_handler(zr, astat, stat);
}