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 ea6c577b0eb3131f7366e5b163ed317de4dad623..ea9de8b47db35f03a1b76856fe063405cb750185 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;