Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[mv-sheeva.git] / drivers / media / common / tuners / tda18271-fe.c

diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index 9199e362279c133ed40e534cd467a828952e25ff..b2e15456d5f36600c32c78542c42d7188634071a 100644 (file)
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1198,10 +1198,6 @@ static int tda18271_setup_configuration(struct dvb_frontend *fe,
        priv->output_opt = (cfg) ?
                cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
 
-       /* override default std map with values in config struct */
-       if ((cfg) && (cfg->std_map))
-               tda18271_update_std_map(fe, cfg->std_map);
-
        return 0;
 }
 
@@ -1224,6 +1220,10 @@ static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg)
        if (tda18271_need_cal_on_startup(cfg))
                tda18271_init(fe);
 
+       /* override default std map with values in config struct */
+       if ((cfg) && (cfg->std_map))
+               tda18271_update_std_map(fe, cfg->std_map);
+
        return 0;
 }
 
@@ -1307,6 +1307,10 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                break;
        }
 
+       /* override default std map with values in config struct */
+       if ((cfg) && (cfg->std_map))
+               tda18271_update_std_map(fe, cfg->std_map);
+
        mutex_unlock(&tda18271_list_mutex);
 
        memcpy(&fe->ops.tuner_ops, &tda18271_tuner_ops,
@@ -1326,7 +1330,7 @@ EXPORT_SYMBOL_GPL(tda18271_attach);
 MODULE_DESCRIPTION("NXP TDA18271HD analog / digital tuner driver");
 MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0.3");
+MODULE_VERSION("0.4");
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.