From a73595dcce4d5cc9f3e4cc9ab4e0b0c3972f9742 Mon Sep 17 00:00:00 2001
From: matthieu castet <castet.matthieu@free.fr>
Date: Mon, 21 May 2007 11:15:09 -0300
Subject: [PATCH] --- yaml --- r: 56783 b: refs/heads/master c:
 82c01d3d5a26f82aea1fb2e9a357dfb6404f44db h: refs/heads/master i:   56781:
 28fdb644226c179a58c267f3780a64d83c6fa03c   56779:
 cde2ce91b3a06e686d6c11b43ac0fae2eb7b7003   56775:
 4ebe7b8d31c5a8550a6c7549431018ca70f5e20e   56767:
 4e9a18dc857aa154d21fef98fedd26277b0113f6 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/tuner-simple.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 14fc7d4dd014..d39d122d4884 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4abdcf933f647763592db6bef001d1fae61a5527
+refs/heads/master: 82c01d3d5a26f82aea1fb2e9a357dfb6404f44db
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index 1b9b0742f753..c40b92ce1fad 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/drivers/media/video/tuner-simple.c
@@ -205,9 +205,13 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 		/* 0x01 -> ??? no change ??? */
 		/* 0x02 -> PAL BDGHI / SECAM L */
 		/* 0x04 -> ??? PAL others / SECAM others ??? */
-		cb &= ~0x02;
-		if (t->std & V4L2_STD_SECAM)
-			cb |= 0x02;
+		cb &= ~0x03;
+		if (t->std & V4L2_STD_SECAM_L) //also valid for V4L2_STD_SECAM
+			cb |= PHILIPS_MF_SET_PAL_L;
+		else if (t->std & V4L2_STD_SECAM_LC)
+			cb |= PHILIPS_MF_SET_PAL_L2;
+		else /* V4L2_STD_B|V4L2_STD_GH */
+			cb |= PHILIPS_MF_SET_BG;
 		break;
 
 	case TUNER_TEMIC_4046FM5: