From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 9 Jan 2006 17:25:19 +0000 (-0200)
Subject: V4L/DVB (3117): Fix broken TV standard check.
X-Git-Tag: v2.6.16-rc1~663^2~93
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1789d3aea9e1eca676de011e1e3ebe9171cf9cb;p=linux-2.6

V4L/DVB (3117): Fix broken TV standard check.

- Fix incorrect matching of TV standards leading to incorrect IFPCoff values.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 9bd52993d3..95818bfcb5 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -902,11 +902,12 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 		171.2=16*10.70  FM Radio (at set_radio_freq)
 	*/
 
-	if (t->std & V4L2_STD_NTSC_M_JP) {
+	if (t->std == V4L2_STD_NTSC_M_JP) {
 		IFPCoff = 940;
-	} else if (t->std & V4L2_STD_MN) {
+	} else if ((t->std & V4L2_STD_MN) &&
+		  !(t->std & ~V4L2_STD_MN)) {
 		IFPCoff = 732;
-	} else if (t->std & V4L2_STD_SECAM_LC) {
+	} else if (t->std == V4L2_STD_SECAM_LC) {
 		IFPCoff = 543;
 	} else {
 		IFPCoff = 623;