summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-02 20:52:52 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-02 20:52:52 +0000
commit92d86489f12a97b91898eaffecc71667b5c1c58f (patch)
tree066487c66b2f9dd85655065098f2c4382961d585 /linux/drivers/media
parentb6846f8378e51e39a605b395c560986011bde203 (diff)
downloadmediapointer-dvb-s2-92d86489f12a97b91898eaffecc71667b5c1c58f.tar.gz
mediapointer-dvb-s2-92d86489f12a97b91898eaffecc71667b5c1c58f.tar.bz2
zoran: Fix &&/|| typo
From: Roel Kluin <roel.kluin@gmail.com> Fix &&/|| typo Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/zoran/zoran_card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c
index 733db7690..67ab10878 100644
--- a/linux/drivers/media/video/zoran/zoran_card.c
+++ b/linux/drivers/media/video/zoran/zoran_card.c
@@ -1023,7 +1023,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;