From patchwork Fri Feb 5 23:06:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 77462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o15N7iuc025285 for ; Fri, 5 Feb 2010 23:07:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757600Ab0BEXHn (ORCPT ); Fri, 5 Feb 2010 18:07:43 -0500 Received: from mail-in-09.arcor-online.net ([151.189.21.49]:43178 "EHLO mail-in-09.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756249Ab0BEXHl (ORCPT ); Fri, 5 Feb 2010 18:07:41 -0500 Received: from mail-in-14-z2.arcor-online.net (mail-in-14-z2.arcor-online.net [151.189.8.31]) by mx.arcor.de (Postfix) with ESMTP id 5C78C1AF5DE; Sat, 6 Feb 2010 00:07:38 +0100 (CET) Received: from mail-in-05.arcor-online.net (mail-in-05.arcor-online.net [151.189.21.45]) by mail-in-14-z2.arcor-online.net (Postfix) with ESMTP id 3359C10118; Sat, 6 Feb 2010 00:07:38 +0100 (CET) Received: from localhost.localdomain (dslb-188-103-200-186.pools.arcor-ip.net [188.103.200.186]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-05.arcor-online.net (Postfix) with ESMTPA id C8B1033279F; Sat, 6 Feb 2010 00:07:37 +0100 (CET) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-05.arcor-online.net C8B1033279F DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1265411258; bh=jQ5jCWn6JTmWCbyIsUidg9bCXKhvPSCQo5D71mK3AIk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Kx9RVODNe0raswH+3ZT57mR/0m5fKgfkQKYUIwHRTxVcU13j9NH+5BcGY7+Tq56Mk hhvDUd8LWqXUforqNsAm2/EbqxAIzIbE1BYcZUZGukGyxQ7mMmBMbjXDQtw17aWud/ pXTJ4sNJeMB4XPhTnR3cSQz2jO4436hMDSn3TcUE= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH 11/12] tm6000: bugfix firmware xc3028L-v36.fw used with Zarlink and DTV78 or DTV8 no shift Date: Sat, 6 Feb 2010 00:06:53 +0100 Message-Id: <1265411214-12231-11-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1265411214-12231-10-git-send-email-stefan.ringel@arcor.de> References: <1265411214-12231-10-git-send-email-stefan.ringel@arcor.de> 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 (demeter.kernel.org [140.211.167.41]); Fri, 05 Feb 2010 23:07:44 +0000 (UTC) diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index ed50168..fcf19cc 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c @@ -1114,7 +1114,12 @@ static int xc2028_set_params(struct dvb_frontend *fe, /* All S-code tables need a 200kHz shift */ if (priv->ctrl.demod) { - demod = priv->ctrl.demod + 200; + if ((strcmp (priv->ctrl.fname, "xc3028L-v36.fw") == 0) && + (priv->ctrl.demod == XC3028_FE_ZARLINK456) && + ((type & DTV78) || (type & DTV8))) + demod = priv->ctrl.demod; + else + demod = priv->ctrl.demod + 200; /* * The DTV7 S-code table needs a 700 kHz shift. * Thanks to Terry Wu for reporting this