Skip to content

Commit

Permalink
[media] xc4000: use if_khz provided in xc4000_config
Browse files Browse the repository at this point in the history
Remove hard-coded references to 5400, using the value passed in when the
xc4000 is attached.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent ee4c3cd commit fe83036
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/media/common/tuners/xc4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
u8 scode_buf[13];
u8 indirect_mode[5];

dprintk(1, "%s called\n", __func__);
dprintk(1, "%s called int_freq=%d\n", __func__, int_freq);

if (!int_freq) {
pos = seek_firmware(fe, type, id);
Expand Down Expand Up @@ -1186,7 +1186,7 @@ static int xc4000_set_params(struct dvb_frontend *fe,
dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency);

/* FIXME: setup proper parameters */
if (check_firmware(fe, DTV8, 0, 5400) != XC_RESULT_SUCCESS) {
if (check_firmware(fe, DTV8, 0, priv->if_khz) != XC_RESULT_SUCCESS) {
return -EREMOTEIO;
}

Expand Down Expand Up @@ -1302,7 +1302,7 @@ static int xc4000_set_analog_params(struct dvb_frontend *fe,
__func__, params->frequency);

/* FIXME: setup proper parameters */
if (check_firmware(fe, DTV8, 0, 5400) != XC_RESULT_SUCCESS) {
if (check_firmware(fe, DTV8, 0, priv->if_khz) != XC_RESULT_SUCCESS) {
return -EREMOTEIO;
}

Expand Down Expand Up @@ -1424,7 +1424,7 @@ static int xc4000_init(struct dvb_frontend *fe)
struct xc4000_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __func__);

if (check_firmware(fe, DTV8, 0, 5400) != XC_RESULT_SUCCESS) {
if (check_firmware(fe, DTV8, 0, priv->if_khz) != XC_RESULT_SUCCESS) {
printk(KERN_ERR "xc4000: Unable to initialise tuner\n");
return -EREMOTEIO;
}
Expand Down Expand Up @@ -1547,7 +1547,7 @@ struct dvb_frontend *xc4000_attach(struct dvb_frontend *fe,

/* FIXME: For now, load the firmware at startup. We will remove this
before the code goes to production... */
check_firmware(fe, DTV8, 0, 5400);
check_firmware(fe, DTV8, 0, priv->if_khz);

return fe;
fail:
Expand Down

0 comments on commit fe83036

Please sign in to comment.