From patchwork Sun Jan 2 16:49:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abylai Ospan X-Patchwork-Id: 446431 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 p02GqDqe029739 for ; Sun, 2 Jan 2011 16:52:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754474Ab1ABQvy (ORCPT ); Sun, 2 Jan 2011 11:51:54 -0500 Received: from utm.netup.ru ([193.203.36.250]:47410 "EHLO utm.netup.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753471Ab1ABQvy (ORCPT ); Sun, 2 Jan 2011 11:51:54 -0500 Received: from alkaloid.netup.ru (alkaloid.netup [10.1.2.137]) by utm.netup.ru (Postfix) with ESMTP id 4D7AA35FC7D; Sun, 2 Jan 2011 19:44:53 +0300 (MSK) Message-ID: <4D20AC97.6050303@netup.ru> Date: Sun, 02 Jan 2011 16:49:27 +0000 From: Abylay Ospan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.7) Gecko/20100713 Thunderbird/3.1.1 MIME-Version: 1.0 To: mchehab@infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5 v2] Force xc5000 firmware loading for NetUP Dual DVB-T/C CI RF card 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]); Sun, 02 Jan 2011 16:52:14 +0000 (UTC) diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 53c2b6d..e17be5a 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c @@ -1071,12 +1071,15 @@ static int dvb_register(struct cx23885_tsport *port) fe0->dvb.frontend = dvb_attach(stv0367ter_attach, &netup_stv0367_config[port->nr -1], &i2c_bus->i2c_adap); - if (fe0->dvb.frontend != NULL) + if (fe0->dvb.frontend != NULL) { if (NULL == dvb_attach(xc5000_attach, fe0->dvb.frontend, &i2c_bus->i2c_adap, &netup_xc5000_tunerconfig[port->nr - 1])) goto frontend_detach; + /* load xc5000 firmware */ + fe0->dvb.frontend->ops.tuner_ops.init(fe0->dvb.frontend); + } /* MFE frontend 2 */ fe1 = videobuf_dvb_get_frontend(&port->frontends, 2); if (fe1 == NULL)