From patchwork Sat Oct 9 15:23:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 243421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o99FNDuF015319 for ; Sat, 9 Oct 2010 15:23:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755090Ab0JIPXM (ORCPT ); Sat, 9 Oct 2010 11:23:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20401 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752894Ab0JIPXM (ORCPT ); Sat, 9 Oct 2010 11:23:12 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o99FN9uC006376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 9 Oct 2010 11:23:09 -0400 Received: from [10.3.225.136] (vpn-225-136.phx2.redhat.com [10.3.225.136]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o99FN6iF016937; Sat, 9 Oct 2010 11:23:07 -0400 Message-ID: <4CB088DA.60508@redhat.com> Date: Sat, 09 Oct 2010 12:23:06 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat/3.1.3-1.el6 Lightning/1.0b2 Thunderbird/3.1.3 MIME-Version: 1.0 To: "linux-me >> Linux Media Mailing List" CC: Sri Deevi , Devin Heitmueller Subject: V4L/DVB: cx231xx: Colibri carrier offset was wrong for PAL/M X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 09 Oct 2010 15:23:14 +0000 (UTC) diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index 0903773..d52955c 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -1540,7 +1540,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 */