summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx')
-rw-r--r--linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index c0e037a84..1f137f3c6 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -433,7 +433,6 @@ static void dvb_bt8xx_close(void)
static int __init dvb_bt8xx_init(void)
{
- int result;
int card_id;
unsigned int card_nr;
int card_type;
@@ -442,16 +441,20 @@ static int __init dvb_bt8xx_init(void)
for (card_nr = 0; !bttv_get_cardinfo(card_nr, &card_type, &card_id); card_nr++) {
- if (card_id == 0x01010071) {
+ switch(card_id) {
- if ((result = dvb_bt8xx_load(card_nr, "Nebula DigiTV DVB-T", (1 << 26) | (1 << 14) | (1 << 5))) < 0) {
-
- dvb_bt8xx_close();
-
- return result;
+ case 0x001C11BD:
+
+ dvb_bt8xx_load(card_nr, "Pinnacle PCTV DVB-S", 0x0400C060);
- }
+ break;
+
+ case 0x01010071:
+ dvb_bt8xx_load(card_nr, "Nebula DigiTV DVB-T", (1 << 26) | (1 << 14) | (1 << 5));
+
+ break;
+
}
}