diff --git a/[refs] b/[refs]
index b9d58f47b3d8..7e07d3da8484 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f98c55ea18e87905bdf69eb4a187e94572ed9494
+refs/heads/master: a1789d3aea9e1eca676de011e1e3ebe9171cf9cb
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index 9bd52993d366..95818bfcb5c0 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/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;