From: Michael Krufky Date: Sun, 30 Aug 2009 05:32:23 +0000 (-0300) Subject: V4L/DVB (12866): tda18271: move small_i2c assignment to the state config block X-Git-Tag: firefly_0821_release~12898^2~189 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1216531a1f416df24f67ca8e626df9b3c91e5c75;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Mauro Carvalho Chehab --- 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, 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;