From: Mikael Pettersson <mikpe@csd.uu.se>
To: alan@lxorguk.ukuu.org.uk
Cc: aheitner@andrew.cmu.edu, juri.haberland@innominate.com,
linux-kernel@vger.kernel.org, rsousa@grad.physics.sunysb.edu
Subject: [PATCH] fix emu10k1 init breakage in 2.2.18
Date: Tue, 19 Dec 2000 13:01:48 +0100 (MET) [thread overview]
Message-ID: <200012191201.NAA02004@harpo.it.uu.se> (raw)
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/
next reply other threads:[~2000-12-19 12:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-12-19 12:01 Mikael Pettersson [this message]
2000-12-19 18:44 ` [PATCH] fix emu10k1 init breakage in 2.2.18 Andreas M. Kirchwitz
2000-12-20 9:44 ` Juri Haberland
2000-12-22 1:17 ` Andreas M. Kirchwitz
2000-12-20 20:58 ` kees
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200012191201.NAA02004@harpo.it.uu.se \
--to=mikpe@csd.uu.se \
--cc=aheitner@andrew.cmu.edu \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=juri.haberland@innominate.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rsousa@grad.physics.sunysb.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).