From: Hans Verkuil Fix incorrect matching of TV standards leading to incorrect IFPCoff values. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/tuner-simple.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/media/video/tuner-simple.c~v4l-dvb-3117-fix-broken-tv-standard-check drivers/media/video/tuner-simple.c --- devel/drivers/media/video/tuner-simple.c~v4l-dvb-3117-fix-broken-tv-standard-check 2005-12-09 22:51:22.000000000 -0800 +++ devel-akpm/drivers/media/video/tuner-simple.c 2005-12-09 22:51:22.000000000 -0800 @@ -902,11 +902,12 @@ static void default_set_tv_freq(struct i 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; _