diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-12-24 02:36:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:04:20 -0500 |
commit | c90762799c42df203fc2c9c1a2ac39f154f8faca (patch) | |
tree | 3ceeb7cea8cc1ae0e5b94d1ae99c144d985a8006 /drivers/media/video/tda8290.c | |
parent | fe0bf6d783d8057bd3dd0dd69613a390d6986c47 (diff) |
V4L/DVB (6908): tda8290: add the option not to probe for tuners passed 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>
Diffstat (limited to 'drivers/media/video/tda8290.c')
-rw-r--r-- | drivers/media/video/tda8290.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c index 2e1d9b663a91..bb62d5629af2 100644 --- a/drivers/media/video/tda8290.c +++ b/drivers/media/video/tda8290.c | |||
@@ -688,10 +688,17 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, | |||
688 | sizeof(struct analog_demod_ops)); | 688 | sizeof(struct analog_demod_ops)); |
689 | } | 689 | } |
690 | 690 | ||
691 | if (tda829x_find_tuner(fe) < 0) | 691 | if ((!(cfg) || (TDA829X_PROBE_TUNER == cfg->probe_tuner)) && |
692 | (tda829x_find_tuner(fe) < 0)) | ||
692 | goto fail; | 693 | goto fail; |
693 | 694 | ||
694 | switch (priv->ver) { | 695 | switch (priv->ver) { |
696 | case TDA8290: | ||
697 | name = "tda8290"; | ||
698 | break; | ||
699 | case TDA8295: | ||
700 | name = "tda8295"; | ||
701 | break; | ||
695 | case TDA8290 | TDA8275: | 702 | case TDA8290 | TDA8275: |
696 | name = "tda8290+75"; | 703 | name = "tda8290+75"; |
697 | break; | 704 | break; |