lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] xc4000: use if_khz provided in xc4000_config

Browse Source 
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>
This commit is contained in:
Devin Heitmueller
2009-07-28 00:04:27 -03:00
committed by Mauro Carvalho Chehab
parent ee4c3cd67b
commit fe83036476
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/common/tuners/xc4000.c
View File

@@ -883,7 +883,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
u8 scode_buf[13]; u8 scode_buf[13];
u8 indirect_mode[5]; u8 indirect_mode[5];
dprintk(1, "%s called\n", __func__); dprintk(1, "%s called int_freq=%d\n", __func__, int_freq);
if (!int_freq) { if (!int_freq) {
pos = seek_firmware(fe, type, id); pos = seek_firmware(fe, type, id);
@@ -1186,7 +1186,7 @@ static int xc4000_set_params(struct dvb_frontend *fe,
dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency); dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency);
/* FIXME: setup proper parameters */ /* 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; return -EREMOTEIO;
} }
@@ -1302,7 +1302,7 @@ static int xc4000_set_analog_params(struct dvb_frontend *fe,
__func__, params->frequency); __func__, params->frequency);
/* FIXME: setup proper parameters */ /* 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; return -EREMOTEIO;
} }
@@ -1424,7 +1424,7 @@ static int xc4000_init(struct dvb_frontend *fe)
struct xc4000_priv *priv = fe->tuner_priv; struct xc4000_priv *priv = fe->tuner_priv;
dprintk(1, "%s()\n", __func__); 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"); printk(KERN_ERR "xc4000: Unable to initialise tuner\n");
return -EREMOTEIO; return -EREMOTEIO;
} }
@@ -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 /* FIXME: For now, load the firmware at startup. We will remove this
before the code goes to production... */ before the code goes to production... */
check_firmware(fe, DTV8, 0, 5400); check_firmware(fe, DTV8, 0, priv->if_khz);
return fe; return fe;
fail: fail: