V4L/DVB (13217): tda18271: handle rf_cal_on_startup properly during attach

If rf_cal_on_startup is enabled in the structure passed into
tda18271_attach, and the cal module option isn't disabled, then we
should run the initialization and calibration procedures during the
tda18271_attach function call, regardless of how many instances of the
driver have been attached.  If the device is already calibrated, the
driver will detect that and will only calibrate again if necessary.

Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c
index 24f1d38081e60e983db1c82b7ecf5d7e62f08b85..8b934f48b6f359cd07caf3a7affcad1ca92c1d22 100644 (file)
--- a/drivers/media/common/tuners/tda18271-fe.c
+++ b/drivers/media/common/tuners/tda18271-fe.c
@@ -1249,7 +1249,7 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                                     struct tda18271_config *cfg)
 {
        struct tda18271_priv *priv = NULL;
-       int instance;
+       int instance, rf_cal_on_startup = 0;
 
        mutex_lock(&tda18271_list_mutex);
 
@@ -1262,8 +1262,6 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
        case 1:
        {
                /* new tuner instance */
-               int rf_cal_on_startup;
-
                fe->tuner_priv = priv;
 
                tda18271_setup_configuration(fe, cfg);
@@ -1315,7 +1313,20 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                                priv->output_opt = cfg->output_opt;
                        if (cfg->std_map)
                                tda18271_update_std_map(fe, cfg->std_map);
+
+                       /* tda18271_cal_on_startup == -1 when cal
+                        * module option is unset */
+                       if (tda18271_cal_on_startup == -1) {
+                               /* honor attach-time configuration */
+                               rf_cal_on_startup =
+                                       (cfg->rf_cal_on_startup) ? 1 : 0;
+                       } else {
+                               /* module option overrides attach config */
+                               rf_cal_on_startup = tda18271_cal_on_startup;
+                       }
                }
+               if (rf_cal_on_startup)
+                       tda18271_init(fe);
                break;
        }