diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-21 12:51:35 +0200 |
| commit | 382e6a859e6622de0aa62c01976ae8ebd90e986d (patch) | |
| tree | 2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/hda/hda_intel.c | |
| parent | 6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff) | |
| parent | 97f8d3b6503082416898f893a442a78f8819c42a (diff) | |
| download | linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 7ee46aba6ea7..4ab8102f87ea 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2566,6 +2566,8 @@ static struct snd_pci_quirk probe_mask_list[] __devinitdata = { /* forced codec slots */ SND_PCI_QUIRK(0x1043, 0x1262, "ASUS W5Fm", 0x103), SND_PCI_QUIRK(0x1046, 0x1262, "ASUS W5F", 0x103), + /* WinFast VP200 H (Teradici) user reported broken communication */ + SND_PCI_QUIRK(0x3a21, 0x040d, "WinFast VP200 H", 0x101), {} }; @@ -3154,7 +3156,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { MODULE_DEVICE_TABLE(pci, azx_ids); /* pci_driver definition */ -static struct pci_driver driver = { +static struct pci_driver azx_driver = { .name = KBUILD_MODNAME, .id_table = azx_ids, .probe = azx_probe, @@ -3165,15 +3167,4 @@ static struct pci_driver driver = { #endif }; -static int __init alsa_card_azx_init(void) -{ - return pci_register_driver(&driver); -} - -static void __exit alsa_card_azx_exit(void) -{ - pci_unregister_driver(&driver); -} - -module_init(alsa_card_azx_init) -module_exit(alsa_card_azx_exit) +module_pci_driver(azx_driver); |