Remove tuning fallback code for delivery system.
The current driver tries DVB-S and then DVB-S2, or vice vera. In fact,
the DVB-S2 support in kernel 3.2 is not complete yet. The userspace
program currently specifies delivery system explicitly, there is no need
for the fallback code.
Google-Bug-Id: 19432272
Change-Id: I39fa650e2aa82c17a76c96067141b5f3e9f351f4
diff --git a/drivers/media/dvb/frontends/dvbsky_m88rs6000.c b/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
index 522e1aa..19197e8 100644
--- a/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
+++ b/drivers/media/dvb/frontends/dvbsky_m88rs6000.c
@@ -1422,18 +1422,6 @@
msleep(20);
}
- if((status & FE_HAS_LOCK) == 0){
- state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS;
- m88rs6000_demod_connect(fe, lpf_offset_KHz);
-
- for (i = 0; i < 30 ; i++) {
- m88rs6000_read_status(fe, &status);
- if (status & FE_HAS_LOCK)
- break;
- msleep(20);
- }
- }
-
if (status & FE_HAS_LOCK){
if (state->config->set_ts_params)
state->config->set_ts_params(fe, 0);
