---

yaml
---
r: 164095
b: refs/heads/master
c: d5abef6
h: refs/heads/master
i:
  164093: a0a69a6
  164091: 13bea10
  164087: 9199474
  164079: ff440d7
  164063: 5fe971a
  164031: 0850d68
  163967: 45012aa
  163839: 820908f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1216531a1f416df24f67ca8e626df9b3c91e5c75
+refs/heads/master: d5abef6be1715040ac50e834bc042031f7613fa9

trunk/drivers/media/common/tuners/tda18271-fe.c

@@ -1258,9 +1258,19 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
 		/* existing tuner instance */
 		fe->tuner_priv = priv;
 
-		/* allow dvb driver to override i2c gate setting */
-		if ((cfg) && (cfg->gate != TDA18271_GATE_ANALOG))
-			priv->gate = cfg->gate;
+		/* allow dvb driver to override configuration settings */
+		if (cfg) {
+			if (cfg->gate != TDA18271_GATE_ANALOG)
+				priv->gate = cfg->gate;
+			if (cfg->role)
+				priv->role = cfg->role;
+			if (cfg->config)
+				priv->config = cfg->config;
+			if (cfg->small_i2c)
+				priv->small_i2c = cfg->small_i2c;
+			if (cfg->output_opt)
+				priv->output_opt = cfg->output_opt;
+		}
 		break;
 	}