---

yaml --- r: 331251 b: refs/heads/master c: 6b82e0c h: refs/heads/master i: 331249: ec2ae20 331247: 6cea9a0 v: v3
git-mirror · Oct 2, 2012 · 35c167b · 35c167b
1 parent 24ea534
commit 35c167b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48307a90e66855d89c10dd3eb13a082c4a6b8e4
+refs/heads/master: 6b82e0cfc15ec7e635eea83b04e1544ab64f81ad
diff --git a/trunk/drivers/media/tuners/tda18271-fe.c b/trunk/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/trunk/drivers/media/tuners/tda18271.h b/trunk/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;
 };