Messages in this thread Patch in this message | | | Date | Tue, 25 Jul 2006 11:15:25 -0400 | From | Michael Krufky <> | Subject | Re: [patch 07/45] v4l/dvb: Fix CI on old KNC1 DVBC cards |
| |
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 <adq_dvb@lidskialf.net>
[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 <adq_dvb@lidskialf.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
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)); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |