Skip to content

Commit

Permalink
[media] ds3000: don't load firmware during demod init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Igor M. Liplianin authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent caa687c commit b9bf2ea
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/media/dvb/frontends/ds3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b9bf2ea

Please sign in to comment.