From: Roel Kluin <roel.kluin@gmail.com>
Date: Sat, 2 May 2009 20:52:52 +0000 (-0300)
Subject: V4L/DVB (11741): zoran: Fix &&/|| typo
X-Git-Tag: v2.6.31-rc1~297^2~224
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b475f4eeda1da16e995b2302f6eebdfb08ce18cd;p=profile%2Fivi%2Fkernel-x86-ivi.git

V4L/DVB (11741): zoran: Fix &&/|| typo

Fix &&/|| typo. `default_norm' can be 0 (PAL), 1 (NTSC) or 2 (SECAM),
the condition tested was impossible.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index ea6c577..ea9de8b 100644
--- 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;