Commit b475f4ee authored May 02, 2009 by Roel Kluin Committed by Mauro Carvalho Chehab Jun 16, 2009

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>

parent 223ffe5f

drivers/media/video/zoran/zoran_card.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;