2 files changed, 10 insertions, 0 deletions

diff --git a/drivers/media/tuners/tda18271-fe.c b/drivers/media/tuners/tda18271-fe.c
index de21197ca4b9..ca202da9d4c9 100644
--- a/drivers/media/tuners/tda18271-fe.c
+++ b/drivers/media/tuners/tda18271-fe.c
@@ -1278,6 +1278,11 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
                 if (tda_fail(ret))
                         goto fail;
 
+                /* if delay_cal is set, delay IR & RF calibration until init()
+                 * module option 'cal' overrides this delay */
+                if ((cfg->delay_cal) && (!tda18271_need_cal_on_startup(cfg)))
+                        break;
+
                 mutex_lock(&priv->lock);
                 tda18271_init_regs(fe);
 
diff --git a/drivers/media/tuners/tda18271.h b/drivers/media/tuners/tda18271.h
index 640bae4e6a5a..89b6c6d93fec 100644
--- a/drivers/media/tuners/tda18271.h
+++ b/drivers/media/tuners/tda18271.h
@@ -105,6 +105,11 @@ struct tda18271_config {
         /* force rf tracking filter calibration on startup */
         unsigned int rf_cal_on_startup:1;
 
+        /* prevent any register access during attach(),
+         * delaying both IR & RF calibration until init()
+         * module option 'cal' overrides this delay */
+        unsigned int delay_cal:1;
+
         /* interface to saa713x / tda829x */
         unsigned int config;
 };