summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-07-28 00:04:27 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:52:30 -0300
commitfe8303647640e1183640a9b85cd60c4a981c7b4b (patch)
treeeea69bf2f0e36bc58d47009e08d5103e4cc90945 /drivers/media/common
parentee4c3cd67b90cb42143e230485d3aad60768c551 (diff)
downloadblackbird-op-linux-fe8303647640e1183640a9b85cd60c4a981c7b4b.tar.gz
blackbird-op-linux-fe8303647640e1183640a9b85cd60c4a981c7b4b.zip
[media] xc4000: use if_khz provided in xc4000_config
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>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/tuners/xc4000.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c
index 65d07ebcd2c9..2dacf209d427 100644
--- a/drivers/media/common/tuners/xc4000.c
+++ b/drivers/media/common/tuners/xc4000.c
@@ -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);
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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:
OpenPOWER on IntegriCloud