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>

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 4a70d2a6f74f13bab17f952c5a1d1d613b7d720a..ff562fdae4a5056b8555e2b3dc28e9611022900e 100644 (file)
--- 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)
 //                     if (p_dst_type->tuner_type != TUNER_TYPE_MULTI) {
                        /*      Multiple tuners         */
                        if (p_dst_type->tuner_type & TUNER_TYPE_MULTI) {
-                               /*      STV0299 check   */
-                               if (dst_check_stv0299(state) < 0)
-                                       dprintk(verbose, DST_ERROR, 1, "Unsupported");
-                               /*      MB86A15 check   */
+                               switch (use_dst_type) {
+                               case DST_TYPE_IS_SAT:
+                                       /*      STV0299 check   */
+                                       if (dst_check_stv0299(state) < 0) {
+                                               dprintk(verbose, DST_ERROR, 1, "Unsupported");
+                                               state->tuner_type = TUNER_TYPE_MB86A15;
+                                       }
+                                       break;
+                               default:
+                                       break;
+                               }
                                if (dst_check_mb86a15(state) < 0)
                                        dprintk(verbose, DST_ERROR, 1, "Unsupported");
                        /*      Single tuner            */