Alan,
2.2.18 broke the emu10k1 driver when compiled into the kernel.
The problem is that 2.2.18 now implements 2.4-style module_init,
so emu10k1 ended up being initialised twice when built non-modular,
which rendered it dysfunctional. The fix is to remove the now
obsolete explicit init calls. Patch below. Please apply.
/Mikael
--- linux-2.2.19pre2/drivers/sound/emu10k1/main.c.~1~ Mon Dec 11 22:10:15 2000
+++ linux-2.2.19pre2/drivers/sound/emu10k1/main.c Tue Dec 19 12:28:33 2000
@@ -784,10 +784,3 @@
module_init(emu10k1_init_module);
module_exit(emu10k1_cleanup_module);
-
-#ifndef MODULE
-int __init init_emu10k1(void)
-{
- return emu10k1_init_module();
-}
-#endif
--- linux-2.2.19pre2/drivers/sound/sound_core.c.~1~ Mon Dec 11 22:10:15 2000
+++ linux-2.2.19pre2/drivers/sound/sound_core.c Tue Dec 19 12:28:20 2000
@@ -63,7 +63,6 @@
extern int init_solo1(void);
extern int init_ymf7xxsb_module(void);
extern int cs_probe(void);
-extern int init_emu10k1(void);
extern int cs4281_probe(void);
extern void init_vwsnd(void);
extern int ymf_probe(void);
@@ -434,9 +433,6 @@
#endif
#ifdef CONFIG_SOUND_CS4281
cs4281_probe();
-#endif
-#ifdef CONFIG_SOUND_EMU10K1
- init_emu10k1();
#endif
#ifdef CONFIG_SOUND_YMFPCI
ymf_probe();
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Dec 23 2000 - 21:00:24 EST