diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-26 07:19:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-26 07:19:39 +0200 |
| commit | 1a442cc3df1427c9797085218a6f9acae0b68b15 (patch) | |
| tree | 520128c88f2b0275e164f65041c65ab09c4bf292 | |
| parent | 07a5e9d4fd0218e9243875c87f85287a2a3b38c0 (diff) | |
| download | olio-linux-3.10-1a442cc3df1427c9797085218a6f9acae0b68b15.tar.xz olio-linux-3.10-1a442cc3df1427c9797085218a6f9acae0b68b15.zip | |
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>
| -rw-r--r-- | sound/pci/asihpi/asihpi.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 7b5259b6032..e8de831f98b 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) = { }; MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl); -static struct pci_driver asihpi_driver = { +static struct pci_driver driver = { .name = KBUILD_MODNAME, .id_table = asihpi_pci_tbl, .probe = snd_asihpi_probe, @@ -2974,4 +2974,19 @@ static struct pci_driver asihpi_driver = { #endif }; -module_pci_driver(asihpi_driver); +static int __init snd_asihpi_init(void) +{ + asihpi_init(); + return pci_register_driver(&driver); +} + +static void __exit snd_asihpi_exit(void) +{ + + pci_unregister_driver(&driver); + asihpi_exit(); +} + +module_init(snd_asihpi_init) +module_exit(snd_asihpi_exit) + |