From: Devin Heitmueller Date: Tue, 28 Apr 2009 17:07:14 +0000 (-0300) Subject: V4L/DVB (11799): xc5000: don't load firmware until a tuning request is made X-Git-Tag: firefly_0821_release~13887^2~179 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee7e63f599ae797c785281ee552c7da98b4efb7d;p=firefly-linux-kernel-4.4.55.git V4L/DVB (11799): xc5000: don't load firmware until a tuning request is made 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. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 1dac524fc8f1..4018eacb3a4c 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -420,10 +420,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: