[media] ds3000: don't load firmware during demod init

Speed up tuning, as firmware is not necessary to load every attempt to tune

Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
index b2f0f4e8e51222a0685116e1ae0769f266e2c90c..993357383fd4bdcda66879706e4be02c9a327668 100644 (file)
--- a/drivers/media/dvb/frontends/ds3000.c
+++ b/drivers/media/dvb/frontends/ds3000.c
@@ -1029,14 +1029,6 @@ static int ds3000_tune(struct dvb_frontend *fe,
 
        dprintk("%s() ", __func__);
 
-       /* Load the firmware if required */
-       ret = ds3000_firmware_ondemand(fe);
-       if (ret != 0) {
-               printk(KERN_ERR "%s: Unable initialise the firmware\n",
-                                                               __func__);
-               return ret;
-       }
-
        state->dnxt.delivery = c->modulation;
        state->dnxt.frequency = c->frequency;
        state->dnxt.rolloff = 2; /* fixme */
@@ -1314,6 +1306,12 @@ static int ds3000_initfe(struct dvb_frontend *fe)
        ds3000_tuner_writereg(state, 0x42, 0x73);
        ds3000_tuner_writereg(state, 0x05, 0x01);
        ds3000_tuner_writereg(state, 0x62, 0xf5);
+       /* Load the firmware if required */
+       ret = ds3000_firmware_ondemand(fe);
+       if (ret != 0) {
+               printk(KERN_ERR "%s: Unable initialize firmware\n", __func__);
+               return ret;
+       }
 
        return 0;
 }