Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (13216): tda18271: initialize tuner during set_config if rf_cal_on_startup is set

Browse source 
If rf_cal_on_startup is enabled in the structure passed into
tda18271_set_config, and the cal module option isn't disabled,
then we should run the initialization and calibration procedures
during the tda18271_set_config function call.

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Krufky 2009-10-24 17:47:49 -03:00 • committed by Mauro Carvalho Chehab
parent 42f9a03ed3
commit c54e1dde58
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/media/common/tuners/tda18271-fe.c
View file

@ -1185,10 +1185,10 @@ static int tda18271_get_id(struct dvb_frontend *fe)
return ret; return ret;
} }
static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg) static int tda18271_setup_configuration(struct dvb_frontend *fe,
struct tda18271_config *cfg)
{ {
struct tda18271_priv *priv = fe->tuner_priv; struct tda18271_priv *priv = fe->tuner_priv;
struct tda18271_config *cfg = (struct tda18271_config *) priv_cfg;
priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO; priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
priv->role = (cfg) ? cfg->role : TDA18271_MASTER; priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
@ -1205,6 +1205,28 @@ static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg)
return 0; return 0;
} }
static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg)
{
struct tda18271_config *cfg = (struct tda18271_config *) priv_cfg;
int rf_cal_on_startup;
tda18271_setup_configuration(fe, cfg);
/* tda18271_cal_on_startup == -1 when cal module option is unset */
if (tda18271_cal_on_startup == -1) {
/* honor configuration setting */
rf_cal_on_startup =
((cfg) && (cfg->rf_cal_on_startup)) ? 1 : 0;
} else {
/* module option overrides configuration setting */
rf_cal_on_startup = tda18271_cal_on_startup;
}
if (rf_cal_on_startup)
tda18271_init(fe);
return 0;
}
static struct dvb_tuner_ops tda18271_tuner_ops = { static struct dvb_tuner_ops tda18271_tuner_ops = {
.info = { .info = {
.name = "NXP TDA18271HD", .name = "NXP TDA18271HD",
@ -1244,7 +1266,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
fe->tuner_priv = priv; fe->tuner_priv = priv;
tda18271_set_config(fe, cfg); tda18271_setup_configuration(fe, cfg);
/* tda18271_cal_on_startup == -1 when cal /* tda18271_cal_on_startup == -1 when cal
* module option is unset */ * module option is unset */