Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / zoran / zoran_device.c

diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index b02007e42150b18f744f28d47db9b1ac19eb2ffb..e8a27844bf39c36e14f466ebb9cd2941f61b4ef3 100644 (file)
--- 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);
                }