aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2009-08-30 01:32:23 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:13:45 -0400
commit1216531a1f416df24f67ca8e626df9b3c91e5c75 (patch)
treeb6ffabc116d85e2f0b6f3e92aa1323448edcee13 /drivers/media/common
parentcc7e26d47f327a928e241b8d59b9203b469d692e (diff)
V4L/DVB (12866): tda18271: move small_i2c assignment to the state config block
minor cleanup: move small_i2c assignment to the state config block Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/tda18271-fe.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index e86d16979e75..063c7987d310 100644
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1219,6 +1219,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
1219 priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO; 1219 priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
1220 priv->role = (cfg) ? cfg->role : TDA18271_MASTER; 1220 priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
1221 priv->config = (cfg) ? cfg->config : 0; 1221 priv->config = (cfg) ? cfg->config : 0;
1222 priv->small_i2c = (cfg) ? cfg->small_i2c : 0;
1222 priv->output_opt = (cfg) ? 1223 priv->output_opt = (cfg) ?
1223 cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON; 1224 cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
1224 1225
@@ -1238,9 +1239,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
1238 1239
1239 fe->tuner_priv = priv; 1240 fe->tuner_priv = priv;
1240 1241
1241 if (cfg)
1242 priv->small_i2c = cfg->small_i2c;
1243
1244 if (tda_fail(tda18271_get_id(fe))) 1242 if (tda_fail(tda18271_get_id(fe)))
1245 goto fail; 1243 goto fail;
1246 1244