Commit 703d8dae authored by Rudo Thomas's avatar Rudo Thomas Committed by Linus Torvalds

[PATCH] fix emu10k1 removal oops

All of the cleanup functions in sound/oss/emu10k1/main.c were incorrectly
marked as __devinit. This little one fixes it, so that the module no longer
oopses when being removed.
parent 21f27357
...@@ -213,7 +213,7 @@ static int __devinit emu10k1_audio_init(struct emu10k1_card *card) ...@@ -213,7 +213,7 @@ static int __devinit emu10k1_audio_init(struct emu10k1_card *card)
return -ENODEV; return -ENODEV;
} }
static void __devinit emu10k1_audio_cleanup(struct emu10k1_card *card) static void emu10k1_audio_cleanup(struct emu10k1_card *card)
{ {
unregister_sound_dsp(card->audio_dev1); unregister_sound_dsp(card->audio_dev1);
unregister_sound_dsp(card->audio_dev); unregister_sound_dsp(card->audio_dev);
...@@ -298,7 +298,7 @@ static int __devinit emu10k1_mixer_init(struct emu10k1_card *card) ...@@ -298,7 +298,7 @@ static int __devinit emu10k1_mixer_init(struct emu10k1_card *card)
return -EIO; return -EIO;
} }
static void __devinit emu10k1_mixer_cleanup(struct emu10k1_card *card) static void emu10k1_mixer_cleanup(struct emu10k1_card *card)
{ {
char s[32]; char s[32];
...@@ -402,7 +402,7 @@ static int __devinit emu10k1_midi_init(struct emu10k1_card *card) ...@@ -402,7 +402,7 @@ static int __devinit emu10k1_midi_init(struct emu10k1_card *card)
return ret; return ret;
} }
static void __devinit emu10k1_midi_cleanup(struct emu10k1_card *card) static void emu10k1_midi_cleanup(struct emu10k1_card *card)
{ {
tasklet_kill(&card->mpuout->tasklet); tasklet_kill(&card->mpuout->tasklet);
kfree(card->mpuout); kfree(card->mpuout);
...@@ -450,7 +450,7 @@ static void __devinit addxmgr_init(struct emu10k1_card *card) ...@@ -450,7 +450,7 @@ static void __devinit addxmgr_init(struct emu10k1_card *card)
card->emupagetable[1] = MAXPAGES - 1; card->emupagetable[1] = MAXPAGES - 1;
} }
static void __devinit fx_cleanup(struct patch_manager *mgr) static void fx_cleanup(struct patch_manager *mgr)
{ {
int i; int i;
for(i = 0; i < mgr->current_pages; i++) for(i = 0; i < mgr->current_pages; i++)
...@@ -967,7 +967,7 @@ static int __devinit emu10k1_init(struct emu10k1_card *card) ...@@ -967,7 +967,7 @@ static int __devinit emu10k1_init(struct emu10k1_card *card)
return 0; return 0;
} }
static void __devinit emu10k1_cleanup(struct emu10k1_card *card) static void emu10k1_cleanup(struct emu10k1_card *card)
{ {
int ch; int ch;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment