summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-04-28 13:07:14 -0400
committerDevin Heitmueller <dheitmueller@kernellabs.com>2009-04-28 13:07:14 -0400
commit6ef6553900dddf6ab737699fbae806b1cf03486a (patch)
treed9ab5b00232c1d3efcca88c55b12fdaa36d50704
parent413a852cd71a91beba74baab6cd04d6303aed136 (diff)
downloadmediapointer-dvb-s2-6ef6553900dddf6ab737699fbae806b1cf03486a.tar.gz
mediapointer-dvb-s2-6ef6553900dddf6ab737699fbae806b1cf03486a.tar.bz2
xc5000: don't load firmware until a tuning request is made
From: Devin Heitmueller <dheitmueller@kernellabs.com> Defer loading of the xc5000 firmware until it is actually needed. This helps on distros that have hald, which results in the device not being available for use for around ten seconds in cases where the i2c bus is slow (such as the HVR-950Q). Also, the firmware load isn't really useful since we immediately put the device to sleep afterward, which means a firmware reload will be required anyway. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
-rw-r--r--linux/drivers/media/video/tuner-core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index bb60c910e..cb715f143 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -434,10 +434,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
if (!dvb_attach(xc5000_attach,
&t->fe, t->i2c->adapter, &xc5000_cfg))
goto attach_failed;
-
- xc_tuner_ops = &t->fe.ops.tuner_ops;
- if (xc_tuner_ops->init)
- xc_tuner_ops->init(&t->fe);
break;
}
default: