diff --git a/[refs] b/[refs] index 677c553ceff7..a10b05c03c84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de1e6ec9f21ebd65d779524b614307291228a623 +refs/heads/master: b32474cb8341bb828f2c2800d5dd615b7cd02182 diff --git a/trunk/drivers/media/dvb/bt8xx/dst.c b/trunk/drivers/media/dvb/bt8xx/dst.c index 4a70d2a6f74f..ff562fdae4a5 100644 --- a/trunk/drivers/media/dvb/bt8xx/dst.c +++ b/trunk/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 */