aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2006-06-21 09:28:31 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 01:05:18 -0400
commitb32474cb8341bb828f2c2800d5dd615b7cd02182 (patch)
tree9b443927d9290d3fa02539fda2ece4477998f7b8
parentde1e6ec9f21ebd65d779524b614307291228a623 (diff)
V4L/DVB (4175): Fix a bug in tuner detection
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/bt8xx/dst.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 4a70d2a6f74f..ff562fdae4a5 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1103,10 +1103,17 @@ static int dst_get_device_id(struct dst_state *state)
1103// if (p_dst_type->tuner_type != TUNER_TYPE_MULTI) { 1103// if (p_dst_type->tuner_type != TUNER_TYPE_MULTI) {
1104 /* Multiple tuners */ 1104 /* Multiple tuners */
1105 if (p_dst_type->tuner_type & TUNER_TYPE_MULTI) { 1105 if (p_dst_type->tuner_type & TUNER_TYPE_MULTI) {
1106 /* STV0299 check */ 1106 switch (use_dst_type) {
1107 if (dst_check_stv0299(state) < 0) 1107 case DST_TYPE_IS_SAT:
1108 dprintk(verbose, DST_ERROR, 1, "Unsupported"); 1108 /* STV0299 check */
1109 /* MB86A15 check */ 1109 if (dst_check_stv0299(state) < 0) {
1110 dprintk(verbose, DST_ERROR, 1, "Unsupported");
1111 state->tuner_type = TUNER_TYPE_MB86A15;
1112 }
1113 break;
1114 default:
1115 break;
1116 }
1110 if (dst_check_mb86a15(state) < 0) 1117 if (dst_check_mb86a15(state) < 0)
1111 dprintk(verbose, DST_ERROR, 1, "Unsupported"); 1118 dprintk(verbose, DST_ERROR, 1, "Unsupported");
1112 /* Single tuner */ 1119 /* Single tuner */