projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75aecc3
)
[media] zoran: bit-wise vs logical and
author
Dan Carpenter
<error27@gmail.com>
Fri, 10 Dec 2010 12:39:34 +0000
(09:39 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 29 Dec 2010 10:17:03 +0000
(08:17 -0200)
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>
drivers/media/video/zoran/zoran_device.c
patch
|
blob
|
history
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);
}