diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-28 14:22:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-28 14:22:59 -0300 |
| commit | c599755e8210ed32a69a488d22dac0aca121fef5 (patch) | |
| tree | 11574011953900f89efc48b0d7ffcb97809159dc /linux/sound/pci/bt87x.c | |
| parent | 86cdf6980ce363417a611ef9a6f689875fb1b79e (diff) | |
| download | mediapointer-dvb-s2-c599755e8210ed32a69a488d22dac0aca121fef5.tar.gz mediapointer-dvb-s2-c599755e8210ed32a69a488d22dac0aca121fef5.tar.bz2 | |
Make code sync with recent ALSA changes on -git
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/pci/bt87x.c')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 65f7b6a4f..b74c0ec58 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -783,6 +783,8 @@ static struct pci_device_id snd_bt87x_ids[] = { BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100), /* AVerMedia Studio No. 103, 203, ...? */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000), + /* Leadtek Winfast tv 2000xp delux */ + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, 32000), { } }; MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); @@ -793,12 +795,15 @@ static struct { unsigned short subvendor, subdevice; } blacklist[] __devinitdata = { {0x0071, 0x0101}, /* Nebula Electronics DigiTV */ + {0x11bd, 0x001c}, /* Pinnacle PCTV Sat */ {0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */ {0x1461, 0x0761}, /* AVermedia AverTV DVB-T */ {0x1461, 0x0771}, /* AVermedia DVB-T 771 */ {0x1822, 0x0001}, /* Twinhan VisionPlus DVB-T */ + {0x18ac, 0xd500}, /* DVICO FusionHDTV 5 Lite */ {0x18ac, 0xdb10}, /* DVICO FusionHDTV DVB-T Lite */ {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */ + {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */ }; static struct pci_driver driver; @@ -816,13 +821,23 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) for (i = 0; i < ARRAY_SIZE(blacklist); ++i) if (blacklist[i].subvendor == pci->subsystem_vendor && blacklist[i].subdevice == pci->subsystem_device) { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) snd_printdd(KERN_INFO "card %#04x:%#04x has no audio\n", pci->subsystem_vendor, pci->subsystem_device); +#else + snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n", + pci->device, pci->subsystem_vendor, pci->subsystem_device); +#endif return -EBUSY; } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) snd_printk(KERN_INFO "unknown card %#04x:%#04x, using default rate 32000\n", pci->subsystem_vendor, pci->subsystem_device); +#else + snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x, using default rate 32000\n", + pci->device, pci->subsystem_vendor, pci->subsystem_device); +#endif snd_printk(KERN_DEBUG "please mail id, board name, and, " "if it works, the correct digital_rate option to " "<alsa-devel@lists.sf.net>\n"); |