PATCH: please backout this set of broken changes

Alan Cox (alan@lxorguk.ukuu.org.uk)
Mon, 9 Aug 1999 15:22:00 +0100 (BST)


Whoever changed these drivers to use __initcall broke the sound subsystem.
The cards are now misordered between 2.0-2.2 and 2.3 series kernels. This
makes your sound change card according to kernel version.

Folks: you can't use __initcall tricks for anything where existing order
matters for back compatibility - ie most network, scsi, and sound drivers.

This patch, and the related es1370/1/sonicvibes changes are broken

Alan

diff -u --recursive --new-file v2.3.12/linux/drivers/sound/sound_core.c linux/drivers/sound/sound_core.c
--- v2.3.12/linux/drivers/sound/sound_core.c Mon Jun 7 11:06:10 1999
+++ linux/drivers/sound/sound_core.c Wed Aug 4 09:27:54 1999
@@ -52,15 +52,6 @@
struct sound_unit *next;
};

-#ifdef CONFIG_SOUND_SONICVIBES
-extern int init_sonicvibes(void);
-#endif
-#ifdef CONFIG_SOUND_ES1370
-extern int init_es1370(void);
-#endif
-#ifdef CONFIG_SOUND_ES1371
-extern int init_es1371(void);
-#endif
#ifdef CONFIG_SOUND_MSNDCLAS
extern int msnd_classic_init(void);
#endif
@@ -395,17 +386,8 @@
/*
* Now init non OSS drivers
*/
-#ifdef CONFIG_SOUND_SONICVIBES
- init_sonicvibes();
-#endif
#ifdef CONFIG_SOUND_CMPCI
init_cmpci();
-#endif
-#ifdef CONFIG_SOUND_ES1370
- init_es1370();
-#endif
-#ifdef CONFIG_SOUND_ES1371
- init_es1371();
#endif
#ifdef CONFIG_SOUND_MSNDCLAS
msnd_classic_init();

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/