fix emu10k1 init breakage in 2.2.18
PATCH 1/1 fix emu10k1 init breakage in 2.2.18
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
drivers/sound/emu10k1/main.c renamed from drivers/sound/emu10k1/main.c.~1~ +0 -7
@@ -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
drivers/sound/sound_core.c renamed from drivers/sound/sound_core.c.~1~ +0 -4
@@ -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 [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Quoted 5 lines · Mikael Pettersson
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.
Is there also a fix available to make the bass and treble settings work again in mixer applications (for example, Gnome mix 1.2.0)? This is (now, was) one of the biggest advantages of this card to have control over bass and treble settings.
It worked for the early 2.2.18pre patches, but stopped working in the latest ones (including final 2.2.18).
Greetings, Andreas
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Hello,
The patch indeed solves the problem with EMU10K. It now works well except from the fact that the trebble and bass controls still have been vanished.
Thanks for the patch.
Kees
BTW could it be something simular for es1371?. This also fails with 2.2.18
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
Quoted 9 lines · Andreas M. Kirchwitz
Quoted 5 lines · Mikael Pettersson
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.
Quoted 7 lines
Is there also a fix available to make the bass and treble settings work again in mixer applications (for example, Gnome mix 1.2.0)? This is (now, was) one of the biggest advantages of this card to have control over bass and treble settings.
It worked for the early 2.2.18pre patches, but stopped working in the latest ones (including final 2.2.18).
Yes, put something like "EXTRA_CFLAGS += -DTONE_CONTROL" into the Makefile in drivers/sound/emu10k1/
Juri
Signature · 8 lines
[email protected] system engineer innominate AG clustering & security the linux architects tel: +49-30-308806-45 fax: -77 http://www.innominate.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] Please read the FAQ at http://www.tux.org/lkml/
Quoted 7 lines · Juri Haberland
Quoted 4 lines
Quoted 1 line
2.2.18 broke the emu10k1 driver when compiled into the kernel.
Is there also a fix available to make the bass and treble settings work again in mixer applications (for example, Gnome mix 1.2.0)?
Yes, put something like "
EXTRA_CFLAGS+= -DTONE_CONTROL" into theMakefileindrivers/sound/emu10k1/
Ah, TONE_CONTROL... yeah, that's it. Do you know the reason why bass/treble controls are disabled by default? Aren't they stable enough for production use?
I'm just wondering why anybody wants to have this turned off. ;-)
Greetings from Berlin to Berlin ... Andreas
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/