diff options
Diffstat (limited to 'sound/pci/bt87x.c')
-rw-r--r-- | sound/pci/bt87x.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index c840a4c08e98..7b44a8db033d 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -783,6 +783,8 @@ static struct pci_device_id snd_bt87x_ids[] = { | |||
783 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100), | 783 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100), |
784 | /* AVerMedia Studio No. 103, 203, ...? */ | 784 | /* AVerMedia Studio No. 103, 203, ...? */ |
785 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000), | 785 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, 48000), |
786 | /* Leadtek Winfast tv 2000xp delux */ | ||
787 | BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, 32000), | ||
786 | { } | 788 | { } |
787 | }; | 789 | }; |
788 | MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); | 790 | MODULE_DEVICE_TABLE(pci, snd_bt87x_ids); |
@@ -793,12 +795,15 @@ static struct { | |||
793 | unsigned short subvendor, subdevice; | 795 | unsigned short subvendor, subdevice; |
794 | } blacklist[] __devinitdata = { | 796 | } blacklist[] __devinitdata = { |
795 | {0x0071, 0x0101}, /* Nebula Electronics DigiTV */ | 797 | {0x0071, 0x0101}, /* Nebula Electronics DigiTV */ |
798 | {0x11bd, 0x001c}, /* Pinnacle PCTV Sat */ | ||
796 | {0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */ | 799 | {0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */ |
797 | {0x1461, 0x0761}, /* AVermedia AverTV DVB-T */ | 800 | {0x1461, 0x0761}, /* AVermedia AverTV DVB-T */ |
798 | {0x1461, 0x0771}, /* AVermedia DVB-T 771 */ | 801 | {0x1461, 0x0771}, /* AVermedia DVB-T 771 */ |
799 | {0x1822, 0x0001}, /* Twinhan VisionPlus DVB-T */ | 802 | {0x1822, 0x0001}, /* Twinhan VisionPlus DVB-T */ |
803 | {0x18ac, 0xd500}, /* DVICO FusionHDTV 5 Lite */ | ||
800 | {0x18ac, 0xdb10}, /* DVICO FusionHDTV DVB-T Lite */ | 804 | {0x18ac, 0xdb10}, /* DVICO FusionHDTV DVB-T Lite */ |
801 | {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */ | 805 | {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */ |
806 | {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */ | ||
802 | }; | 807 | }; |
803 | 808 | ||
804 | static struct pci_driver driver; | 809 | static struct pci_driver driver; |
@@ -816,13 +821,13 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) | |||
816 | for (i = 0; i < ARRAY_SIZE(blacklist); ++i) | 821 | for (i = 0; i < ARRAY_SIZE(blacklist); ++i) |
817 | if (blacklist[i].subvendor == pci->subsystem_vendor && | 822 | if (blacklist[i].subvendor == pci->subsystem_vendor && |
818 | blacklist[i].subdevice == pci->subsystem_device) { | 823 | blacklist[i].subdevice == pci->subsystem_device) { |
819 | snd_printdd(KERN_INFO "card %#04x:%#04x has no audio\n", | 824 | snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n", |
820 | pci->subsystem_vendor, pci->subsystem_device); | 825 | pci->device, pci->subsystem_vendor, pci->subsystem_device); |
821 | return -EBUSY; | 826 | return -EBUSY; |
822 | } | 827 | } |
823 | 828 | ||
824 | snd_printk(KERN_INFO "unknown card %#04x:%#04x, using default rate 32000\n", | 829 | snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x, using default rate 32000\n", |
825 | pci->subsystem_vendor, pci->subsystem_device); | 830 | pci->device, pci->subsystem_vendor, pci->subsystem_device); |
826 | snd_printk(KERN_DEBUG "please mail id, board name, and, " | 831 | snd_printk(KERN_DEBUG "please mail id, board name, and, " |
827 | "if it works, the correct digital_rate option to " | 832 | "if it works, the correct digital_rate option to " |
828 | "<alsa-devel@lists.sf.net>\n"); | 833 | "<alsa-devel@lists.sf.net>\n"); |