summaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners/tda18271-fe.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2012-10-01 23:50:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-02 15:16:04 -0300
commit6b82e0cfc15ec7e635eea83b04e1544ab64f81ad (patch)
treeb123695c84c829ef6f32de02c0dd4e990701fc06 /drivers/media/tuners/tda18271-fe.c
parente48307a90e66855d89c10dd3eb13a082c4a6b8e4 (diff)
downloadblackbird-op-linux-6b82e0cfc15ec7e635eea83b04e1544ab64f81ad.tar.gz
blackbird-op-linux-6b82e0cfc15ec7e635eea83b04e1544ab64f81ad.zip
[media] tda18271: delay IR & RF calibration until init() if delay_cal is set
if the configuration option 'delay_cal' is set, delay both IR & RF calibration until init() is called. both module option 'cal' or configuration option 'rf_cal_on_startup' will override this delay. it makes no sense to mix 'delay_cal' with 'rf_cal_on_startup' as these options conflict with each other. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/tuners/tda18271-fe.c')
-rw-r--r--drivers/media/tuners/tda18271-fe.c5
1 files changed, 5 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);
OpenPOWER on IntegriCloud