summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/dvb/frontends/stv0299.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index 97036259a..85bfe083d 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -103,7 +103,6 @@ static struct dvb_frontend_info uni0299_info = {
struct stv0299_state {
u8 tuner_type;
- u8 initialised:1;
u32 tuner_frequency;
};
@@ -1153,16 +1152,8 @@ static int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
break;
case FE_INIT:
- if ((!state->initialised) || (state->tuner_type != PHILIPS_SU1278_TSA_TT)) {
- state->initialised = 1;
- return stv0299_init (i2c, state->tuner_type);
- } else {
- stv0299_writereg (i2c, 0x0c, 0x01); /* LNB power on! */
- stv0299_writereg (i2c, 0x08, 0x02); /* LNB power on! */
- stv0299_writereg (i2c, 0x02, 0x30);
- return 0;
- }
-
+ state->tuner_frequency = 0;
+ return stv0299_init (i2c, state->tuner_type);
case FE_DISEQC_SEND_MASTER_CMD:
return stv0299_send_diseqc_msg (i2c, arg);
@@ -1280,7 +1271,6 @@ static int uni0299_attach (struct dvb_i2c_bus *i2c, void **data)
*data = state;
state->tuner_type = tuner_type;
- state->initialised = 0;
state->tuner_frequency = 0;
return dvb_register_frontend (uni0299_ioctl, i2c, (void *) state,
&uni0299_info);