From 40bd264f77c4337d874b7febfd448a98972f8d12 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 9 Oct 2010 12:04:25 -0300 Subject: [PATCH] --- yaml --- r: 219284 b: refs/heads/master c: 0f86158375308804f86d36c7d45aaff1d7dc0d96 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-avcore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf05cb0531c1..8639ab6a8c73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1001f90865c2ccd1df7b3a86603c134528e23090 +refs/heads/master: 0f86158375308804f86d36c7d45aaff1d7dc0d96 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c index 4e082435a1b1..cf50fafa8abb 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -1539,7 +1539,7 @@ u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) if (mode == TUNER_MODE_FM_RADIO) { colibri_carrier_offset = 1100000; - } else if (standerd & (V4L2_STD_NTSC | V4L2_STD_NTSC_M_JP)) { + } else if (standerd & (V4L2_STD_MN | V4L2_STD_NTSC_M_JP)) { colibri_carrier_offset = 4832000; /*4.83MHz */ } else if (standerd & (V4L2_STD_PAL_B | V4L2_STD_PAL_G)) { colibri_carrier_offset = 2700000; /*2.70MHz */