1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index 07d6e1c159ca..b2e15456d5f3 100644
--- 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,