git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: emux: Fix mutex deadlock at unloading
[pandora-kernel.git]
/
sound
/
synth
/
emux
/
emux_seq.c
diff --git
a/sound/synth/emux/emux_seq.c
b/sound/synth/emux/emux_seq.c
index
ca5f7ef
..
188fda0
100644
(file)
--- a/
sound/synth/emux/emux_seq.c
+++ b/
sound/synth/emux/emux_seq.c
@@
-21,7
+21,7
@@
#include "emux_voice.h"
#include <linux/slab.h>
#include "emux_voice.h"
#include <linux/slab.h>
-
+#include <linux/module.h>
/* Prototypes for static functions */
static void free_port(void *private);
/* Prototypes for static functions */
static void free_port(void *private);
@@
-124,12
+124,10
@@
snd_emux_detach_seq(struct snd_emux *emu)
if (emu->voices)
snd_emux_terminate_all(emu);
if (emu->voices)
snd_emux_terminate_all(emu);
- mutex_lock(&emu->register_mutex);
if (emu->client >= 0) {
snd_seq_delete_kernel_client(emu->client);
emu->client = -1;
}
if (emu->client >= 0) {
snd_seq_delete_kernel_client(emu->client);
emu->client = -1;
}
- mutex_unlock(&emu->register_mutex);
}
}