diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-12-24 02:36:14 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-12-24 02:36:14 -0500 |
| commit | 9a09e3eb40c7039cc892ff330695d0703ef829d8 (patch) | |
| tree | 3f2730c78599bbf15fafeb7a7b4b7196ae4b0285 | |
| parent | 391255eb77b1c4fc5d70a1ddec9195736e13a8c6 (diff) | |
| download | mediapointer-dvb-s2-9a09e3eb40c7039cc892ff330695d0703ef829d8.tar.gz mediapointer-dvb-s2-9a09e3eb40c7039cc892ff330695d0703ef829d8.tar.bz2 | |
tda8290: add the option not to probe for tuners passed into tda829x_config
From: Michael Krufky <mkrufky@linuxtv.org>
Prevent the tda8290 module from probing for tuners during tda829x_attach,
by passing:
.probe_tuner = TDA829X_DONT_PROBE,
...in struct tda829x_config
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/tda8290.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda8290.h | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 972fdab96..960cd2664 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -714,10 +714,17 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, sizeof(struct analog_demod_ops)); } - if (tda829x_find_tuner(fe) < 0) + if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) && + (tda829x_find_tuner(fe) < 0)) goto fail; switch (priv->ver) { + case TDA8290: + name = "tda8290"; + break; + case TDA8295: + name = "tda8295"; + break; case TDA8290 | TDA8275: name = "tda8290+75"; break; diff --git a/linux/drivers/media/video/tda8290.h b/linux/drivers/media/video/tda8290.h index 7bce03183..dc8ef310b 100644 --- a/linux/drivers/media/video/tda8290.h +++ b/linux/drivers/media/video/tda8290.h @@ -23,6 +23,10 @@ struct tda829x_config { unsigned int *lna_cfg; int (*tuner_callback) (void *dev, int command, int arg); + + unsigned int probe_tuner:1; +#define TDA829X_PROBE_TUNER 0 +#define TDA829X_DONT_PROBE 1 }; #if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE)) |