RME HDSP MADI pci naming bug
PATCH 1/1 RME HDSP MADI pci naming bug
Hello,
I discovered a trivial bug where the snd-hdsp and snd-hdspm do not play
together. They cannot be loaded as modules simultaneously and create detection problems if compiled as static modules in a kernel. The problem come from the sysfs while registering their PCI names, which happens to be the same (oops). Therefore the first module to get loaded stayed in, but the secound one would be blocked...not anymore ;)
-joachim
Signature · 3 lines
Joachim Deguara Email: [email protected] Fraunhofer IDMT, Langewiesener St. 22, 98693 Ilmenau, Germany Phone: +49 3677/69-4851 Fax: +49 3677/69-4399
hdspm.c renamed from hdspm.c_orig +4 -4
@@ -1,6 +1,6 @@/* -*- linux-c -*- * -* ALSA driver for RME Hammerfall DSP audio interface(s) +* ALSA driver for RME Hammerfall DSP MADI audio interface(s) * * Copyright (c) 2003 Winfried Ritsch (IEM) * code based on hdsp.c Paul Davis
@@ -3732,7 +3732,7 @@ }static struct pci_driver driver = { - .name ="RME Hammerfall DSP" , + .name ="RME Hammerfall DSP MADI" , .id_table = snd_hdspm_ids, .probe = snd_hdspm_probe, .remove =__devexit_p (snd_hdspm_remove),
@@ -3746,7 +3746,7 @@return 0 ; }#ifdef MODULE -printk (KERN_ERR "RME Hammerfall-DSP: no HDSPM\n" ); +printk (KERN_ERR "RME Hammerfall-DSP MADI: no HDSPM\n" );#endif return -ENODEV ; }
@@ -3755,7 +3755,7 @@ {pci_unregister_driver (&driver);#ifdef MODULE -snd_printdd ("RME Hammerfall-DSP: HDSPM unloaded\n" ); +snd_printdd ("RME Hammerfall-DSP MADI: HDSPM unloaded\n" );#endif }
Quoted 7 lines · Joachim Deguara
Hello,
I discovered a trivial bug where the snd-hdsp and snd-hdspm do not play
together. They cannot be loaded as modules simultaneously and create detection problems if compiled as static modules in a kernel. The problem come from the sysfs while registering their PCI names, which happens to be the same (oops). Therefore the first module to get loaded stayed in, but the secound one would be blocked...not anymore ;)
Thanks. Applied to CVS.
Jaroslav
-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SUSE Labs
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005