git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
V4L/DVB (11741): zoran: Fix &&/|| typo
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran
/
zoran_card.c
diff --git
a/drivers/media/video/zoran/zoran_card.c
b/drivers/media/video/zoran/zoran_card.c
index
ea6c577
..
ea9de8b
100644
(file)
--- a/
drivers/media/video/zoran/zoran_card.c
+++ b/
drivers/media/video/zoran/zoran_card.c
@@
-1022,7
+1022,7
@@
zr36057_init (struct zoran *zr)
zr->vbuf_bytesperline = 0;
/* Avoid nonsense settings from user for default input/norm */
- if (default_norm < 0
&&
default_norm > 2)
+ if (default_norm < 0
||
default_norm > 2)
default_norm = 0;
if (default_norm == 0) {
zr->norm = V4L2_STD_PAL;