From d5268e71de5803923db67e45ac5fb0be2e436969 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 24 Dec 2007 04:36:14 -0300 Subject: [PATCH] --- yaml --- r: 76657 b: refs/heads/master c: c90762799c42df203fc2c9c1a2ac39f154f8faca h: refs/heads/master i: 76655: ef4eebf5c7bcb05563625ee2795fcb7e813e40d4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tda8290.c | 9 ++++++++- trunk/drivers/media/video/tda8290.h | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a47eb428522..73ee452116c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe0bf6d783d8057bd3dd0dd69613a390d6986c47 +refs/heads/master: c90762799c42df203fc2c9c1a2ac39f154f8faca diff --git a/trunk/drivers/media/video/tda8290.c b/trunk/drivers/media/video/tda8290.c index 2e1d9b663a91..bb62d5629af2 100644 --- a/trunk/drivers/media/video/tda8290.c +++ b/trunk/drivers/media/video/tda8290.c @@ -688,10 +688,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/trunk/drivers/media/video/tda8290.h b/trunk/drivers/media/video/tda8290.h index 7bce03183d08..dc8ef310b7b2 100644 --- a/trunk/drivers/media/video/tda8290.h +++ b/trunk/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))