Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c54e1dde authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarMichael Krufky <mkrufky@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 42f9a03e

drivers/media/common/tuners/tda18271-fe.c

+25 −3
Original line number Diff line number Diff line
@@ -1185,10 +1185,10 @@ static int tda18271_get_id(struct dvb_frontend *fe) 
	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_config *cfg = (struct tda18271_config *) priv_cfg;



	priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;

	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;

}



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 = {

	.info = {

		.name = "NXP TDA18271HD",
@@ -1244,7 +1266,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr, 


		fe->tuner_priv = priv;



		tda18271_set_config(fe, cfg);

		tda18271_setup_configuration(fe, cfg);



		/* tda18271_cal_on_startup == -1 when cal

		 * module option is unset */