Skip to content

Commit

Permalink
V4L/DVB (6908): tda8290: add the option not to probe for tuners passe…
Browse files Browse the repository at this point in the history
…d into tda829x_config

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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent fe0bf6d commit c907627
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/media/video/tda8290.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions drivers/media/video/tda8290.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit c907627

Please sign in to comment.