From 98632bbf1fca82671af0672ea20c5dee2a6c95c2 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 1 Nov 2009 02:52:01 -0300 Subject: [PATCH] --- yaml --- r: 174032 b: refs/heads/master c: 972aacc2989506d9c67f8b710021ff98041363d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/tda18271-fe.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d52aace19a88..e9cbaed8d527 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0700adec9efec3136fa44d90f064c9227817f37b +refs/heads/master: 972aacc2989506d9c67f8b710021ff98041363d5 diff --git a/trunk/drivers/media/common/tuners/tda18271-fe.c b/trunk/drivers/media/common/tuners/tda18271-fe.c index 07d6e1c159ca..b2e15456d5f3 100644 --- a/trunk/drivers/media/common/tuners/tda18271-fe.c +++ b/trunk/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,