diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-29 09:56:24 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-29 09:56:24 -0200 |
| commit | 9de1f43dd5943674395d5b4a53e7c0f3e58493e7 (patch) | |
| tree | 3bc1ed2ebcb0ee083593c82b67eff2ecffd5cafd /linux/drivers/media/video | |
| parent | 5298417f16d81740faa6e8ad35143ae399dbe41f (diff) | |
| parent | 3856cfc66c20f6900f59a524c0b1a907a12e101b (diff) | |
| download | mediapointer-dvb-s2-9de1f43dd5943674395d5b4a53e7c0f3e58493e7.tar.gz mediapointer-dvb-s2-9de1f43dd5943674395d5b4a53e7c0f3e58493e7.tar.bz2 | |
merge: reverting changeset 5b83176312cc
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/tuner-xc2028.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/tuner-xc2028.c b/linux/drivers/media/video/tuner-xc2028.c index e7ae8c40f..1700b97ea 100644 --- a/linux/drivers/media/video/tuner-xc2028.c +++ b/linux/drivers/media/video/tuner-xc2028.c @@ -160,7 +160,7 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val) } #define dump_firm_type(t) dump_firm_type_and_int_freq(t, 0) -static void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq) +void dump_firm_type_and_int_freq(unsigned int type, u16 int_freq) { if (type & BASE) printk("BASE "); @@ -770,12 +770,10 @@ skip_std_specific: } /* Load SCODE firmware, if exists */ - if (!new_fw.type & FM) { - tuner_dbg("Trying to load scode %d\n", new_fw.scode_nr); + tuner_dbg("Trying to load scode %d\n", new_fw.scode_nr); - rc = load_scode(fe, new_fw.type | new_fw.scode_table, - &new_fw.id, new_fw.int_freq, new_fw.scode_nr); - } + rc = load_scode(fe, new_fw.type | new_fw.scode_table, &new_fw.id, + new_fw.int_freq, new_fw.scode_nr); check_device: if (xc2028_get_reg(priv, 0x0004, &version) < 0 || |