diff --git a/[refs] b/[refs]
index ece8f49d3393..8b0a3c8d8018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc7e26d47f327a928e241b8d59b9203b469d692e
+refs/heads/master: 1216531a1f416df24f67ca8e626df9b3c91e5c75
diff --git a/trunk/drivers/media/common/tuners/tda18271-fe.c b/trunk/drivers/media/common/tuners/tda18271-fe.c
index e86d16979e75..063c7987d310 100644
--- a/trunk/drivers/media/common/tuners/tda18271-fe.c
+++ b/trunk/drivers/media/common/tuners/tda18271-fe.c
@@ -1219,6 +1219,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 		priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
 		priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
 		priv->config = (cfg) ? cfg->config : 0;
+		priv->small_i2c = (cfg) ? cfg->small_i2c : 0;
 		priv->output_opt = (cfg) ?
 			cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
 
@@ -1238,9 +1239,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 
 		fe->tuner_priv = priv;
 
-		if (cfg)
-			priv->small_i2c = cfg->small_i2c;
-
 		if (tda_fail(tda18271_get_id(fe)))
 			goto fail;