13 files changed, 170 insertions, 90 deletions

diff --git a/drivers/media/dvb/frontends/atbm8830_priv.h b/drivers/media/dvb/frontends/atbm8830_priv.h
index ce960f76092..d460058d497 100644
--- a/drivers/media/dvb/frontends/atbm8830_priv.h
+++ b/drivers/media/dvb/frontends/atbm8830_priv.h
@@ -18,7 +18,7 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
- 
+
 #ifndef __ATBM8830_PRIV_H
 #define __ATBM8830_PRIV_H
 
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 24268ef2753..68dba3a4b4d 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -664,6 +664,13 @@ static int au8522_reset(struct v4l2_subdev *sd, u32 val)
 {
         struct au8522_state *state = to_state(sd);
 
+        state->operational_mode = AU8522_ANALOG_MODE;
+
+        /* Clear out any state associated with the digital side of the
+           chip, so that when it gets powered back up it won't think
+           that it is already tuned */
+        state->current_frequency = 0;
+
         au8522_writereg(state, 0xa4, 1 << 5);
 
         return 0;
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c
index a1fed0fa8ed..65f6a36dfb2 100644
--- a/drivers/media/dvb/frontends/au8522_dig.c
+++ b/drivers/media/dvb/frontends/au8522_dig.c
@@ -84,6 +84,14 @@ static int au8522_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 
         dprintk("%s(%d)\n", __func__, enable);
 
+        if (state->operational_mode == AU8522_ANALOG_MODE) {
+                /* We're being asked to manage the gate even though we're
+                   not in digital mode.  This can occur if we get switched
+                   over to analog mode before the dvb_frontend kernel thread
+                   has completely shutdown */
+                return 0;
+        }
+
         if (enable)
                 return au8522_writereg(state, 0x106, 1);
         else
@@ -608,6 +616,13 @@ int au8522_init(struct dvb_frontend *fe)
         struct au8522_state *state = fe->demodulator_priv;
         dprintk("%s()\n", __func__);
 
+        state->operational_mode = AU8522_DIGITAL_MODE;
+
+        /* Clear out any state associated with the digital side of the
+           chip, so that when it gets powered back up it won't think
+           that it is already tuned */
+        state->current_frequency = 0;
+
         au8522_writereg(state, 0xa4, 1 << 5);
 
         au8522_i2c_gate_ctrl(fe, 1);
@@ -704,6 +719,15 @@ int au8522_sleep(struct dvb_frontend *fe)
         struct au8522_state *state = fe->demodulator_priv;
         dprintk("%s()\n", __func__);
 
+        /* Only power down if the digital side is currently using the chip */
+        if (state->operational_mode == AU8522_ANALOG_MODE) {
+                /* We're not in one of the expected power modes, which means
+                   that the DVB thread is probably telling us to go to sleep
+                   even though the analog frontend has already started using
+                   the chip.  So ignore the request */
+                return 0;
+        }
+
         /* turn off led */
         au8522_led_ctrl(state, 0);
 
@@ -932,6 +956,8 @@ struct dvb_frontend *au8522_attach(const struct au8522_config *config,
         /* setup the state */
         state->config = config;
         state->i2c = i2c;
+        state->operational_mode = AU8522_DIGITAL_MODE;
+
         /* create dvb_frontend */
         memcpy(&state->frontend.ops, &au8522_ops,
                sizeof(struct dvb_frontend_ops));
diff --git a/drivers/media/dvb/frontends/au8522_priv.h b/drivers/media/dvb/frontends/au8522_priv.h
index c74c4e72fe9..609cf04bc31 100644
--- a/drivers/media/dvb/frontends/au8522_priv.h
+++ b/drivers/media/dvb/frontends/au8522_priv.h
@@ -34,10 +34,15 @@
 #include "au8522.h"
 #include "tuner-i2c.h"
 
+#define AU8522_ANALOG_MODE 0
+#define AU8522_DIGITAL_MODE 1
+
 struct au8522_state {
         struct i2c_client *c;
         struct i2c_adapter *i2c;
 
+        u8 operational_mode;
+
         /* Used for sharing of the state between analog and digital mode */
         struct tuner_i2c_props i2c_props;
         struct list_head hybrid_tuner_instance_list;
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 40a09981027..afad252abf4 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -814,42 +814,51 @@ EXPORT_SYMBOL(dib3000mc_set_config);
 
 int dib3000mc_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib3000mc_config cfg[])
 {
-        struct dib3000mc_state st = { .i2c_adap = i2c };
+        struct dib3000mc_state *dmcst;
         int k;
         u8 new_addr;
 
         static u8 DIB3000MC_I2C_ADDRESS[] = {20,22,24,26};
 
+        dmcst = kzalloc(sizeof(struct dib3000mc_state), GFP_KERNEL);
+        if (dmcst == NULL)
+                return -ENODEV;
+
+        dmcst->i2c_adap = i2c;
+
         for (k = no_of_demods-1; k >= 0; k--) {
-                st.cfg = &cfg[k];
+                dmcst->cfg = &cfg[k];
 
                 /* designated i2c address */
                 new_addr          = DIB3000MC_I2C_ADDRESS[k];
-                st.i2c_addr = new_addr;
-                if (dib3000mc_identify(&st) != 0) {
-                        st.i2c_addr = default_addr;
-                        if (dib3000mc_identify(&st) != 0) {
+                dmcst->i2c_addr = new_addr;
+                if (dib3000mc_identify(dmcst) != 0) {
+                        dmcst->i2c_addr = default_addr;
+                        if (dib3000mc_identify(dmcst) != 0) {
                                 dprintk("-E-  DiB3000P/MC #%d: not identified\n", k);
+                                kfree(dmcst);
                                 return -ENODEV;
                         }
                 }
 
-                dib3000mc_set_output_mode(&st, OUTMODE_MPEG2_PAR_CONT_CLK);
+                dib3000mc_set_output_mode(dmcst, OUTMODE_MPEG2_PAR_CONT_CLK);
 
                 // set new i2c address and force divstr (Bit 1) to value 0 (Bit 0)
-                dib3000mc_write_word(&st, 1024, (new_addr << 3) | 0x1);
-                st.i2c_addr = new_addr;
+                dib3000mc_write_word(dmcst, 1024, (new_addr << 3) | 0x1);
+                dmcst->i2c_addr = new_addr;
         }
 
         for (k = 0; k < no_of_demods; k++) {
-                st.cfg = &cfg[k];
-                st.i2c_addr = DIB3000MC_I2C_ADDRESS[k];
+                dmcst->cfg = &cfg[k];
+                dmcst->i2c_addr = DIB3000MC_I2C_ADDRESS[k];
 
-                dib3000mc_write_word(&st, 1024, st.i2c_addr << 3);
+                dib3000mc_write_word(dmcst, 1024, dmcst->i2c_addr << 3);
 
                 /* turn off data output */
-                dib3000mc_set_output_mode(&st, OUTMODE_HIGH_Z);
+                dib3000mc_set_output_mode(dmcst, OUTMODE_HIGH_Z);
         }
+
+        kfree(dmcst);
         return 0;
 }
 EXPORT_SYMBOL(dib3000mc_i2c_enumeration);
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 85468a45c34..2e28b973dfd 100644
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -1324,46 +1324,54 @@ EXPORT_SYMBOL(dib7000p_pid_filter);
 
 int dib7000p_i2c_enumeration(struct i2c_adapter *i2c, int no_of_demods, u8 default_addr, struct dib7000p_config cfg[])
 {
-        struct dib7000p_state st = { .i2c_adap = i2c };
+        struct dib7000p_state *dpst;
         int k = 0;
         u8 new_addr = 0;
 
+        dpst = kzalloc(sizeof(struct dib7000p_state), GFP_KERNEL);
+        if (!dpst)
+                return -ENOMEM;
+
+        dpst->i2c_adap = i2c;
+
         for (k = no_of_demods-1; k >= 0; k--) {
-                st.cfg = cfg[k];
+                dpst->cfg = cfg[k];
 
                 /* designated i2c address */
                 new_addr          = (0x40 + k) << 1;
-                st.i2c_addr = new_addr;
-                dib7000p_write_word(&st, 1287, 0x0003); /* sram lead in, rdy */
-                if (dib7000p_identify(&st) != 0) {
-                        st.i2c_addr = default_addr;
-                        dib7000p_write_word(&st, 1287, 0x0003); /* sram lead in, rdy */
-                        if (dib7000p_identify(&st) != 0) {
+                dpst->i2c_addr = new_addr;
+                dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */
+                if (dib7000p_identify(dpst) != 0) {
+                        dpst->i2c_addr = default_addr;
+                        dib7000p_write_word(dpst, 1287, 0x0003); /* sram lead in, rdy */
+                        if (dib7000p_identify(dpst) != 0) {
                                 dprintk("DiB7000P #%d: not identified\n", k);
+                                kfree(dpst);
                                 return -EIO;
                         }
                 }
 
                 /* start diversity to pull_down div_str - just for i2c-enumeration */
-                dib7000p_set_output_mode(&st, OUTMODE_DIVERSITY);
+                dib7000p_set_output_mode(dpst, OUTMODE_DIVERSITY);
 
                 /* set new i2c address and force divstart */
-                dib7000p_write_word(&st, 1285, (new_addr << 2) | 0x2);
+                dib7000p_write_word(dpst, 1285, (new_addr << 2) | 0x2);
 
                 dprintk("IC %d initialized (to i2c_address 0x%x)", k, new_addr);
         }
 
         for (k = 0; k < no_of_demods; k++) {
-                st.cfg = cfg[k];
-                st.i2c_addr = (0x40 + k) << 1;
+                dpst->cfg = cfg[k];
+                dpst->i2c_addr = (0x40 + k) << 1;
 
                 // unforce divstr
-                dib7000p_write_word(&st, 1285, st.i2c_addr << 2);
+                dib7000p_write_word(dpst, 1285, dpst->i2c_addr << 2);
 
                 /* deactivate div - it was just for i2c-enumeration */
-                dib7000p_set_output_mode(&st, OUTMODE_HIGH_Z);
+                dib7000p_set_output_mode(dpst, OUTMODE_HIGH_Z);
         }
 
+        kfree(dpst);
         return 0;
 }
 EXPORT_SYMBOL(dib7000p_i2c_enumeration);
diff --git a/drivers/media/dvb/frontends/dib8000.h b/drivers/media/dvb/frontends/dib8000.h
index b1ee2079963..e0a9ded11df 100644
--- a/drivers/media/dvb/frontends/dib8000.h
+++ b/drivers/media/dvb/frontends/dib8000.h
@@ -109,6 +109,7 @@ static inline void dib8000_pwm_agc_reset(struct dvb_frontend *fe)
 static inline s32 dib8000_get_adc_power(struct dvb_frontend *fe, u8 mode)
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        return 0;
 }
 #endif
 
diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
index cff3535566f..78001e8bcdb 100644
--- a/drivers/media/dvb/frontends/ds3000.c
+++ b/drivers/media/dvb/frontends/ds3000.c
@@ -719,7 +719,7 @@ static int ds3000_read_snr(struct dvb_frontend *fe, u16 *snr)
                                 (ds3000_readreg(state, 0x8d) << 4);
                 dvbs2_signal_reading = ds3000_readreg(state, 0x8e);
                 tmp = dvbs2_signal_reading * dvbs2_signal_reading >> 1;
-                if (dvbs2_signal_reading == 0) {
+                if (tmp == 0) {
                         *snr = 0x0000;
                         return 0;
                 }
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index 01f8f1f802f..4f5e7d3a0e6 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1583,7 +1583,7 @@ static enum dvbfe_search stv0900_search(struct dvb_frontend *fe,
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 
         struct stv0900_search_params p_search;
-        struct stv0900_signal_info p_result;
+        struct stv0900_signal_info p_result = intp->result[demod];
 
         enum fe_stv0900_error error = STV0900_NO_ERROR;
 
@@ -1842,6 +1842,19 @@ static void stv0900_release(struct dvb_frontend *fe)
         kfree(state);
 }
 
+static int stv0900_get_frontend(struct dvb_frontend *fe,
+                                struct dvb_frontend_parameters *p)
+{
+        struct stv0900_state *state = fe->demodulator_priv;
+        struct stv0900_internal *intp = state->internal;
+        enum fe_stv0900_demod_num demod = state->demod;
+        struct stv0900_signal_info p_result = intp->result[demod];
+
+        p->frequency = p_result.locked ? p_result.frequency : 0;
+        p->u.qpsk.symbol_rate = p_result.locked ? p_result.symbol_rate : 0;
+        return 0;
+}
+
 static struct dvb_frontend_ops stv0900_ops = {
 
         .info = {
@@ -1862,6 +1875,7 @@ static struct dvb_frontend_ops stv0900_ops = {
         },
         .release                        = stv0900_release,
         .init                           = stv0900_init,
+        .get_frontend                   = stv0900_get_frontend,
         .get_frontend_algo              = stv0900_frontend_algo,
         .i2c_gate_ctrl                  = stv0900_i2c_gate_ctrl,
         .diseqc_send_master_cmd         = stv0900_send_master_cmd,
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 96972804f4a..425e7a43ae1 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -754,11 +754,19 @@ static int stv090x_write_reg(struct stv090x_state *state, unsigned int reg, u8 d
         return stv090x_write_regs(state, reg, &data, 1);
 }
 
-static int stv090x_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
+static int stv090x_i2c_gate_ctrl(struct stv090x_state *state, int enable)
 {
-        struct stv090x_state *state = fe->demodulator_priv;
         u32 reg;
 
+        /*
+         * NOTE! A lock is used as a FSM to control the state in which
+         * access is serialized between two tuners on the same demod.
+         * This has nothing to do with a lock to protect a critical section
+         * which may in some other cases be confused with protecting I/O
+         * access to the demodulator gate.
+         * In case of any error, the lock is unlocked and exit within the
+         * relevant operations themselves.
+         */
         if (enable)
                 mutex_lock(&state->internal->tuner_lock);
 
@@ -1778,7 +1786,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
                                 freq -= cur_step * car_step;
 
                         /* Setup tuner */
-                        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                                 goto err;
 
                         if (state->config->tuner_set_frequency) {
@@ -1791,12 +1799,12 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
                                         goto err_gateoff;
                         }
 
-                        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                                 goto err;
 
                         msleep(50);
 
-                        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                                 goto err;
 
                         if (state->config->tuner_get_status) {
@@ -1809,7 +1817,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
                         else
                                 dprintk(FE_DEBUG, 1, "Tuner unlocked");
 
-                        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                                 goto err;
 
                 }
@@ -1822,7 +1830,7 @@ static u32 stv090x_srate_srch_coarse(struct stv090x_state *state)
         return srate_coarse;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -2167,7 +2175,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
                                                 freq -= cur_step * car_step;
 
                                         /* Setup tuner */
-                                        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                                                 goto err;
 
                                         if (state->config->tuner_set_frequency) {
@@ -2180,12 +2188,12 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
                                                         goto err_gateoff;
                                         }
 
-                                        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                                                 goto err;
 
                                         msleep(50);
 
-                                        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                                                 goto err;
 
                                         if (state->config->tuner_get_status) {
@@ -2198,7 +2206,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
                                         else
                                                 dprintk(FE_DEBUG, 1, "Tuner unlocked");
 
-                                        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                                                 goto err;
 
                                         STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c);
@@ -2222,7 +2230,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
         return lock;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -2591,7 +2599,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
         }
         state->delsys = stv090x_get_std(state);
 
-        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                 goto err;
 
         if (state->config->tuner_get_frequency) {
@@ -2599,7 +2607,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
                         goto err_gateoff;
         }
 
-        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                 goto err;
 
         offst_freq = stv090x_get_car_freq(state, state->internal->mclk) / 1000;
@@ -2619,7 +2627,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
 
         if ((state->algo == STV090x_BLIND_SEARCH) || (state->srate < 10000000)) {
 
-                if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                         goto err;
 
                 if (state->config->tuner_get_frequency) {
@@ -2627,7 +2635,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
                                 goto err_gateoff;
                 }
 
-                if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                         goto err;
 
                 if (abs(offst_freq) <= ((state->search_range / 2000) + 500))
@@ -2646,7 +2654,7 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
         return STV090x_OUTOFRANGE;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -3000,7 +3008,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
 
                         if (state->algo != STV090x_WARM_SEARCH) {
 
-                                if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                                         goto err;
 
                                 if (state->config->tuner_set_bandwidth) {
@@ -3008,7 +3016,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
                                                 goto err_gateoff;
                                 }
 
-                                if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                                         goto err;
 
                         }
@@ -3059,7 +3067,7 @@ static int stv090x_optimize_track(struct stv090x_state *state)
         return 0;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -3235,7 +3243,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
         }
 
         /* Setup tuner */
-        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                 goto err;
 
         if (state->config->tuner_set_bbgain) {
@@ -3256,17 +3264,17 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
                         goto err_gateoff;
         }
 
-        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                 goto err;
 
         msleep(50);
 
         if (state->config->tuner_get_status) {
-                if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                         goto err;
                 if (state->config->tuner_get_status(fe, &reg) < 0)
                         goto err_gateoff;
-                if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                         goto err;
 
                 if (reg)
@@ -3400,7 +3408,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
         return signal_state;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -3839,6 +3847,17 @@ static int stv090x_sleep(struct dvb_frontend *fe)
         struct stv090x_state *state = fe->demodulator_priv;
         u32 reg;
 
+        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
+                goto err;
+
+        if (state->config->tuner_sleep) {
+                if (state->config->tuner_sleep(fe) < 0)
+                        goto err_gateoff;
+        }
+
+        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
+                goto err;
+
         dprintk(FE_DEBUG, 1, "Set %s to sleep",
                 state->device == STV0900 ? "STV0900" : "STV0903");
 
@@ -3853,6 +3872,9 @@ static int stv090x_sleep(struct dvb_frontend *fe)
                 goto err;
 
         return 0;
+
+err_gateoff:
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -4311,6 +4333,20 @@ static int stv090x_init(struct dvb_frontend *fe)
         u32 reg;
 
         if (state->internal->mclk == 0) {
+                /* call tuner init to configure the tuner's clock output
+                   divider directly before setting up the master clock of
+                   the stv090x. */
+                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
+                        goto err;
+
+                if (config->tuner_init) {
+                        if (config->tuner_init(fe) < 0)
+                                goto err_gateoff;
+                }
+
+                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
+                        goto err;
+
                 stv090x_set_mclk(state, 135000000, config->xtal); /* 135 Mhz */
                 msleep(5);
                 if (stv090x_write_reg(state, STV090x_SYNTCTRL,
@@ -4336,7 +4372,7 @@ static int stv090x_init(struct dvb_frontend *fe)
         if (STV090x_WRITE_DEMOD(state, DEMOD, reg) < 0)
                 goto err;
 
-        if (stv090x_i2c_gate_ctrl(fe, 1) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
                 goto err;
 
         if (config->tuner_set_mode) {
@@ -4349,7 +4385,7 @@ static int stv090x_init(struct dvb_frontend *fe)
                         goto err_gateoff;
         }
 
-        if (stv090x_i2c_gate_ctrl(fe, 0) < 0)
+        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
                 goto err;
 
         if (stv090x_set_tspath(state) < 0)
@@ -4358,7 +4394,7 @@ static int stv090x_init(struct dvb_frontend *fe)
         return 0;
 
 err_gateoff:
-        stv090x_i2c_gate_ctrl(fe, 0);
+        stv090x_i2c_gate_ctrl(state, 0);
 err:
         dprintk(FE_ERROR, 1, "I/O error");
         return -1;
@@ -4503,8 +4539,6 @@ static struct dvb_frontend_ops stv090x_ops = {
         .sleep                          = stv090x_sleep,
         .get_frontend_algo              = stv090x_frontend_algo,
 
-        .i2c_gate_ctrl                  = stv090x_i2c_gate_ctrl,
-
         .diseqc_send_master_cmd         = stv090x_send_diseqc_msg,
         .diseqc_send_burst              = stv090x_send_diseqc_burst,
         .diseqc_recv_slave_reply        = stv090x_recv_slave_reply,
diff --git a/drivers/media/dvb/frontends/stv090x.h b/drivers/media/dvb/frontends/stv090x.h
index 30f01a6902a..dd1b93ae4e9 100644
--- a/drivers/media/dvb/frontends/stv090x.h
+++ b/drivers/media/dvb/frontends/stv090x.h
@@ -87,6 +87,7 @@ struct stv090x_config {
         bool diseqc_envelope_mode;
 
         int (*tuner_init) (struct dvb_frontend *fe);
+        int (*tuner_sleep) (struct dvb_frontend *fe);
         int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
         int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
         int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency);
diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb/frontends/stv6110x.c
index dea4245f077..42591ce1aaa 100644
--- a/drivers/media/dvb/frontends/stv6110x.c
+++ b/drivers/media/dvb/frontends/stv6110x.c
@@ -338,14 +338,12 @@ static struct dvb_tuner_ops stv6110x_ops = {
                 .frequency_max  = 2150000,
                 .frequency_step = 0,
         },
-
-        .init                   = stv6110x_init,
-        .sleep                  = stv6110x_sleep,
         .release                = stv6110x_release
 };
 
 static struct stv6110x_devctl stv6110x_ctl = {
         .tuner_init             = stv6110x_init,
+        .tuner_sleep            = stv6110x_sleep,
         .tuner_set_mode         = stv6110x_set_mode,
         .tuner_set_frequency    = stv6110x_set_frequency,
         .tuner_get_frequency    = stv6110x_get_frequency,
@@ -363,11 +361,10 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
 {
         struct stv6110x_state *stv6110x;
         u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e};
-        int ret;
 
         stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL);
-        if (stv6110x == NULL)
-                goto error;
+        if (!stv6110x)
+                return NULL;
 
         stv6110x->i2c           = i2c;
         stv6110x->config        = config;
@@ -392,34 +389,11 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
                 break;
         }
 
-        if (fe->ops.i2c_gate_ctrl) {
-                ret = fe->ops.i2c_gate_ctrl(fe, 1);
-                if (ret < 0)
-                        goto error;
-        }
-
-        ret = stv6110x_write_regs(stv6110x, 0, stv6110x->regs,
-                                  ARRAY_SIZE(stv6110x->regs));
-        if (ret < 0) {
-                dprintk(FE_ERROR, 1, "Initialization failed");
-                goto error;
-        }
-
-        if (fe->ops.i2c_gate_ctrl) {
-                ret = fe->ops.i2c_gate_ctrl(fe, 0);
-                if (ret < 0)
-                        goto error;
-        }
-
         fe->tuner_priv          = stv6110x;
         fe->ops.tuner_ops       = stv6110x_ops;
 
-        printk("%s: Attaching STV6110x \n", __func__);
+        printk(KERN_INFO "%s: Attaching STV6110x\n", __func__);
         return stv6110x->devctl;
-
-error:
-        kfree(stv6110x);
-        return NULL;
 }
 EXPORT_SYMBOL(stv6110x_attach);
 
diff --git a/drivers/media/dvb/frontends/stv6110x.h b/drivers/media/dvb/frontends/stv6110x.h
index 2429ae6d784..47516753929 100644
--- a/drivers/media/dvb/frontends/stv6110x.h
+++ b/drivers/media/dvb/frontends/stv6110x.h
@@ -40,6 +40,7 @@ enum tuner_status {
 
 struct stv6110x_devctl {
         int (*tuner_init) (struct dvb_frontend *fe);
+        int (*tuner_sleep) (struct dvb_frontend *fe);
         int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
         int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
         int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency);