From b4f5e5e90b8e648d1b70cb265b414799988d354e Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@kernellabs.com>
Date: Sun, 30 Aug 2009 03:07:10 -0300
Subject: [PATCH] --- yaml --- r: 164095 b: refs/heads/master c:
 d5abef6be1715040ac50e834bc042031f7613fa9 h: refs/heads/master i:   164093:
 a0a69a65dc6b49a36d30f70ccb78a415443037fc   164091:
 13bea10360ac61bade1addf6718922a6063dc287   164087:
 9199474b220834618581c3c6896dbdbd1130fc7a   164079:
 ff440d76c6f95b4d635ea634e9b89a437d9cbd22   164063:
 5fe971af93af2874a10877c52c76e0cfd27fcc3a   164031:
 0850d6819f474a65a298a4028925aba85cbcf73a   163967:
 45012aa352f1da78f912595c00846edde2b58189   163839:
 820908f85d8f79136026e16e4e366ec7895ebcf6 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/common/tuners/tda18271-fe.c | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8b0a3c8d8018..d9323ef91780 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1216531a1f416df24f67ca8e626df9b3c91e5c75
+refs/heads/master: d5abef6be1715040ac50e834bc042031f7613fa9
diff --git a/trunk/drivers/media/common/tuners/tda18271-fe.c b/trunk/drivers/media/common/tuners/tda18271-fe.c
index 063c7987d310..152df76cdce8 100644
--- a/trunk/drivers/media/common/tuners/tda18271-fe.c
+++ b/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;
 	}