summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-09 17:04:25 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 05:17:48 +0200
commit0f86158375308804f86d36c7d45aaff1d7dc0d96 (patch)
tree8c71c73f565826a05cc57347f687fdbcc1b8fe3b /drivers
parent[media] cx231xx: remove some unused functions (diff)
downloadlinux-0f86158375308804f86d36c7d45aaff1d7dc0d96.tar.xz
linux-0f86158375308804f86d36c7d45aaff1d7dc0d96.zip
[media] cx231xx: Colibri carrier offset was wrong for PAL/M
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 4e082435a1b1..cf50fafa8abb 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/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 */