aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-04-26 01:19:39 -0400
committerTakashi Iwai <tiwai@suse.de>2012-04-26 01:19:39 -0400
commit1a442cc3df1427c9797085218a6f9acae0b68b15 (patch)
tree520128c88f2b0275e164f65041c65ab09c4bf292 /sound
parent07a5e9d4fd0218e9243875c87f85287a2a3b38c0 (diff)
ALSA: asihpi - Revert module_pci_driver conversion for asihpi.c
It contains non-standard call. Reported-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/asihpi/asihpi.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index 7b5259b6032f..e8de831f98bc 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -2963,7 +2963,7 @@ static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = {
2963}; 2963};
2964MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl); 2964MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
2965 2965
2966static struct pci_driver asihpi_driver = { 2966static struct pci_driver driver = {
2967 .name = KBUILD_MODNAME, 2967 .name = KBUILD_MODNAME,
2968 .id_table = asihpi_pci_tbl, 2968 .id_table = asihpi_pci_tbl,
2969 .probe = snd_asihpi_probe, 2969 .probe = snd_asihpi_probe,
@@ -2974,4 +2974,19 @@ static struct pci_driver asihpi_driver = {
2974#endif 2974#endif
2975}; 2975};
2976 2976
2977module_pci_driver(asihpi_driver); 2977static int __init snd_asihpi_init(void)
2978{
2979 asihpi_init();
2980 return pci_register_driver(&driver);
2981}
2982
2983static void __exit snd_asihpi_exit(void)
2984{
2985
2986 pci_unregister_driver(&driver);
2987 asihpi_exit();
2988}
2989
2990module_init(snd_asihpi_init)
2991module_exit(snd_asihpi_exit)
2992