From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964774AbWGYPUP (ORCPT ); Tue, 25 Jul 2006 11:20:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964775AbWGYPUP (ORCPT ); Tue, 25 Jul 2006 11:20:15 -0400 Received: from kurby.webscope.com ([204.141.84.54]:44465 "EHLO kirby.webscope.com") by vger.kernel.org with ESMTP id S964774AbWGYPUN (ORCPT ); Tue, 25 Jul 2006 11:20:13 -0400 Message-ID: <44C6358D.4040502@linuxtv.org> Date: Tue, 25 Jul 2006 11:15:25 -0400 From: Michael Krufky User-Agent: Thunderbird 1.5.0.4 (Windows/20060516) MIME-Version: 1.0 To: Edgar Hucek CC: Greg KH , linux-kernel@vger.kernel.org, stable@kernel.org, Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, v4l-dvb maintainer list , Andrew de Quincey , Chris Wright Subject: Re: [patch 07/45] v4l/dvb: Fix CI on old KNC1 DVBC cards References: <20060717160652.408007000@blue.kroah.org> <20060717162617.GH4829@kroah.com> <44C61616.7060203@ed-soft.at> In-Reply-To: <44C61616.7060203@ed-soft.at> X-Enigmail-Version: 0.94.0.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Edgar Hucek wrote: > Hi. > > This fix does not compile on 2.6.17.7. > philips_cu1216_tuner_set_params is nowhere defined in the kernel tree. > > cu > > Edgar (gimli) Hucek Yikes! The patch description explains the blunder... Sorry about this. We've got a fix, but would you mind testing it, Edgar, before I request that this gets added to the stable queue? Thanks for reporting, -Mike From: Andrew de Quincey [2.6.17.7 PATCH] Fix budget-av compile failure Currently I am doing lots of refactoring work in the dvb tree. This bugfix became necessary to fix 2.6.17 whilst I was in the middle of this work. Unfortunately after I tested the original code for the patch, I generated the diff against the wrong tree (I accidentally used a tree with part of the refactoring code in it). This resulted in the reported compile errors because that tree (a) was incomplete, and (b) used features which are simply not in the mainline kernel yet. Many apologies for the error and problems this has caused. :( Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c --- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 14:53:19.000000000 +0100 +++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 15:25:32.000000000 +0100 @@ -58,6 +58,7 @@ struct tasklet_struct ciintf_irq_tasklet; int slot_status; struct dvb_ca_en50221 ca; + u8 reinitialise_demod:1; }; /* GPIO Connections: @@ -214,8 +215,9 @@ while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d) msleep(100); - /* reinitialise the frontend */ - dvb_frontend_reinitialise(budget_av->budget.dvb_frontend); + /* reinitialise the frontend if necessary */ + if (budget_av->reinitialise_demod) + dvb_frontend_reinitialise(budget_av->budget.dvb_frontend); if (timeout <= 0) { @@ -1064,12 +1066,10 @@ fe = tda10021_attach(&philips_cu1216_config, &budget_av->budget.i2c_adap, read_pwm(budget_av)); - if (fe) { - fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params; - } break; case SUBID_DVBC_KNC1_PLUS: + budget_av->reinitialise_demod = 1; fe = tda10021_attach(&philips_cu1216_config, &budget_av->budget.i2c_adap, read_pwm(budget_av));