summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tuner-simple.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tuner-simple.c')
-rw-r--r--linux/drivers/media/video/tuner-simple.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index 0c9f43421..dcb927785 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-simple.c,v 1.62 2005/11/30 16:22:53 mchehab Exp $
+ * $Id: tuner-simple.c,v 1.63 2005/12/05 21:32:29 hverkuil Exp $
*
* i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners.
@@ -920,11 +920,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;