summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/mantis
diff options
context:
space:
mode:
authorNiklas Edmundsson <nikke@acc.umu.se>2009-12-04 05:38:52 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:42 -0200
commitec1b6ff1cce9d406a9a5f84a1d1205328f2c515a (patch)
tree33c52abee543542600f1a97a865d16d71577f4b2 /drivers/media/dvb/mantis
parent4af699c13a5fb7332255de5fa56442d065f547a3 (diff)
V4L/DVB (13792): [Mantis/VP-2033] Do not claim TDA10023
Do not rely on the PCI ID alone Signed-off-by: Niklas Edmundsson <nikke@acc.umu.se> Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis')
-rw-r--r--drivers/media/dvb/mantis/mantis_dvb.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 5172e8563546..de18bb97d8e9 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -263,31 +263,32 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
}
break;
case MANTIS_VP_2033_DVB_C: // VP-2033
+ case MANTIS_VP_2040_DVB_C: // VP-2040
+ case TERRATEC_CINERGY_C_PCI:
+ case TECHNISAT_CABLESTAR_HD2:
dprintk(verbose, MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
- mantis->fe = tda10021_attach(&philips_cu1216_config, &mantis->adapter, read_pwm(mantis));
+ mantis->fe = tda10021_attach(&philips_cu1216_config,
+ &mantis->adapter,
+ read_pwm(mantis));
+
if (mantis->fe) {
- mantis->fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set;
dprintk(verbose, MANTIS_ERROR, 1,
"found Philips CU1216 DVB-C frontend (TDA10021) @ 0x%02x",
philips_cu1216_config.demod_address);
-
- dprintk(verbose, MANTIS_ERROR, 1,
- "Mantis DVB-C Philips CU1216 frontend attach success");
-
+ } else {
+ mantis->fe = tda10023_attach(&tda10023_cu1216_config,
+ &mantis->adapter,
+ read_pwm(mantis));
+
+ if (mantis->fe) {
+ dprintk(verbose, MANTIS_ERROR, 1,
+ "found Philips CU1216 DVB-C frontend (TDA10023) @ 0x%02x",
+ philips_cu1216_config.demod_address);
+ }
}
- break;
- case MANTIS_VP_2040_DVB_C: // VP-2040
- case TERRATEC_CINERGY_C_PCI:
- case TECHNISAT_CABLESTAR_HD2:
- dprintk(verbose, MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
- mantis->fe = tda10023_attach(&tda10023_cu1216_config, &mantis->adapter, read_pwm(mantis));
if (mantis->fe) {
mantis->fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set;
dprintk(verbose, MANTIS_ERROR, 1,
- "found Philips CU1216 DVB-C frontend (TDA10023) @ 0x%02x",
- philips_cu1216_config.demod_address);
-
- dprintk(verbose, MANTIS_ERROR, 1,
"Mantis DVB-C Philips CU1216 frontend attach success");
}
break;