diff --git a/[refs] b/[refs]
index 0e13e3201c8d..536a86213128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef40c0088ecbc8863c9404c96065269c83c16259
+refs/heads/master: 36f647bad3d35546892c3639328479355da8690d
diff --git a/trunk/drivers/media/tuners/e4000.c b/trunk/drivers/media/tuners/e4000.c
index ffaa4824d6af..1b33ed368abe 100644
--- a/trunk/drivers/media/tuners/e4000.c
+++ b/trunk/drivers/media/tuners/e4000.c
@@ -366,9 +366,6 @@ struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
 
 	priv->cfg = cfg;
 	priv->i2c = i2c;
-	fe->tuner_priv = priv;
-	memcpy(&fe->ops.tuner_ops, &e4000_tuner_ops,
-			sizeof(struct dvb_tuner_ops));
 
 	/* check if the tuner is there */
 	ret = e4000_rd_reg(priv, 0x02, &chip_id);
@@ -389,6 +386,10 @@ struct dvb_frontend *e4000_attach(struct dvb_frontend *fe,
 			"%s: Elonics E4000 successfully identified\n",
 			KBUILD_MODNAME);
 
+	fe->tuner_priv = priv;
+	memcpy(&fe->ops.tuner_ops, &e4000_tuner_ops,
+			sizeof(struct dvb_tuner_ops));
+
 	if (fe->ops.i2c_gate_ctrl)
 		fe->ops.i2c_gate_ctrl(fe, 0);