diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index 0f867a5..fc8c930 100644
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -22,11 +22,11 @@
 #include "dvb_frontend.h"
 #include "mb86a20s.h"
 
-static int debug = 1;
+static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");
 
-#define rc(args...)  do {						\
+#define printk_rc(args...)  do {						\
 	printk(KERN_ERR  "mb86a20s: " args);				\
 } while (0)
 
@@ -355,7 +355,7 @@ static int mb86a20s_i2c_readreg(struct mb86a20s_state *state,
 	rc = i2c_transfer(state->i2c, msg, 2);
 
 	if (rc != 2) {
-		rc("%s: reg=0x%x (error=%d)\n", __func__, reg, rc);
+		printk_rc("%s: reg=0x%x (error=%d)\n", __func__, reg, rc);
 		return rc;
 	}
 
@@ -370,6 +370,26 @@ static int mb86a20s_i2c_readreg(struct mb86a20s_state *state,
 	mb86a20s_i2c_writeregdata(state, state->config->demod_address, \
 	regdata, ARRAY_SIZE(regdata))
 
+/*
+ * The mb86a20s has an i2c bus which controls the flow of data to the tuner.
+ * When enabled, the data stream flowing normally through the i2c bus, when
+ * disabled the data stream to the tuner is cut and the i2c bus between
+ * mb86a20s and the tuner goes to tri-state.
+ * The data flow between the mb86a20s and its controller (CPU, USB), is not affected.
+ * In hybrid systems with analog and digital TV, the i2c bus control can be done
+ * in the analog demodulator.
+ */
+static int mb86a20s_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
+{
+	struct mb86a20s_state *state = (struct mb86a20s_state *)fe->demodulator_priv;
+
+	/* Enable/Disable I2C bus for tuner control */
+	if (enable)
+		return mb86a20s_writereg(state, 0xfe, 0);
+	else
+		return mb86a20s_writereg(state, 0xfe, 1);
+}
+
 static int mb86a20s_initfe(struct dvb_frontend *fe)
 {
 	struct mb86a20s_state *state = fe->demodulator_priv;
@@ -459,11 +479,7 @@ static int mb86a20s_read_status(struct dvb_frontend *fe, fe_status_t *status)
 	dprintk("\n");
 	*status = 0;
 
-	if (fe->ops.i2c_gate_ctrl)
-		fe->ops.i2c_gate_ctrl(fe, 0);
 	val = mb86a20s_readreg(state, 0x0a) & 0xf;
-	if (fe->ops.i2c_gate_ctrl)
-		fe->ops.i2c_gate_ctrl(fe, 1);
 
 	if (val >= 2)
 		*status |= FE_HAS_SIGNAL;
@@ -489,14 +505,18 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe,
 	struct dvb_frontend_parameters *p)
 {
 	struct mb86a20s_state *state = fe->demodulator_priv;
-	int rc;
+	int i, rc;
 
 	dprintk("\n");
 
-	if (fe->ops.i2c_gate_ctrl)
-		fe->ops.i2c_gate_ctrl(fe, 1);
-	dprintk("Calling tuner set parameters\n");
-	fe->ops.tuner_ops.set_params(fe, p);
+	if (fe->ops.tuner_ops.set_params) {
+		dprintk("Calling tuner set parameters\n");
+		fe->ops.tuner_ops.set_params(fe, p);
+		/* disable I2C bus tuner control */
+		if (fe->ops.i2c_gate_ctrl)
+			fe->ops.i2c_gate_ctrl(fe, 0);
+		msleep(100);
+	}
 
 	/*
 	 * Make it more reliable: if, for some reason, the initial
@@ -511,13 +531,16 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe,
 	if (state->need_init)
 		mb86a20s_initfe(fe);
 
-	if (fe->ops.i2c_gate_ctrl)
-		fe->ops.i2c_gate_ctrl(fe, 0);
 	rc = mb86a20s_writeregdata(state, mb86a20s_reset_reception);
-	if (fe->ops.i2c_gate_ctrl)
-		fe->ops.i2c_gate_ctrl(fe, 1);
+	if (rc < 0)
+		return rc;
 
-	return rc;
+	for (i = 0; i < 20; i++) {
+		if (mb86a20s_readreg(state, 0x0a) >= 8) break;
+		msleep(100);
+	}
+
+	return 0;
 }
 
 static int mb86a20s_get_frontend(struct dvb_frontend *fe,
@@ -553,6 +576,11 @@ static int mb86a20s_tune(struct dvb_frontend *fe,
 	return rc;
 }
 
+static int mb86a20s_get_algo(struct dvb_frontend *fe)
+{
+	return DVBFE_ALGO_HW;
+}
+
 static void mb86a20s_release(struct dvb_frontend *fe)
 {
 	struct mb86a20s_state *state = fe->demodulator_priv;
@@ -575,7 +603,7 @@ struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config,
 
 	dprintk("\n");
 	if (state == NULL) {
-		rc("Unable to kzalloc\n");
+		printk_rc("Unable to kzalloc\n");
 		goto error;
 	}
 
@@ -631,6 +659,8 @@ static struct dvb_frontend_ops mb86a20s_ops = {
 	.get_frontend = mb86a20s_get_frontend,
 	.read_status = mb86a20s_read_status,
 	.read_signal_strength = mb86a20s_read_signal_strength,
+	.i2c_gate_ctrl = mb86a20s_i2c_gate_ctrl,
+	.get_frontend_algo = mb86a20s_get_algo,
 	.tune = mb86a20s_tune,
 };