git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
oss
/
ali5455.c
diff --git
a/sound/oss/ali5455.c
b/sound/oss/ali5455.c
index
9c9e6c0
..
62bb936
100644
(file)
--- a/
sound/oss/ali5455.c
+++ b/
sound/oss/ali5455.c
@@
-64,6
+64,8
@@
#include <linux/smp_lock.h>
#include <linux/ac97_codec.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
#include <linux/ac97_codec.h>
#include <linux/interrupt.h>
+#include <linux/mutex.h>
+
#include <asm/uaccess.h>
#ifndef PCI_DEVICE_ID_ALI_5455
#include <asm/uaccess.h>
#ifndef PCI_DEVICE_ID_ALI_5455
@@
-234,7
+236,7
@@
struct ali_state {
struct ali_card *card; /* Card info */
/* single open lock mechanism, only used for recording */
struct ali_card *card; /* Card info */
/* single open lock mechanism, only used for recording */
- struct
semaphore open_sem
;
+ struct
mutex open_mutex
;
wait_queue_head_t open_wait;
/* file mode */
wait_queue_head_t open_wait;
/* file mode */
@@
-2807,7
+2809,7
@@
found_virt:
state->card = card;
state->magic = ALI5455_STATE_MAGIC;
init_waitqueue_head(&dmabuf->wait);
state->card = card;
state->magic = ALI5455_STATE_MAGIC;
init_waitqueue_head(&dmabuf->wait);
-
init_MUTEX(&state->open_sem
);
+
mutex_init(&state->open_mutex
);
file->private_data = state;
dmabuf->trigger = 0;
/* allocate hardware channels */
file->private_data = state;
dmabuf->trigger = 0;
/* allocate hardware channels */
@@
-3359,7
+3361,7
@@
static void __devinit ali_configure_clocking(void)
state->card = card;
state->magic = ALI5455_STATE_MAGIC;
init_waitqueue_head(&dmabuf->wait);
state->card = card;
state->magic = ALI5455_STATE_MAGIC;
init_waitqueue_head(&dmabuf->wait);
-
init_MUTEX(&state->open_sem
);
+
mutex_init(&state->open_mutex
);
dmabuf->fmt = ALI5455_FMT_STEREO | ALI5455_FMT_16BIT;
dmabuf->trigger = PCM_ENABLE_OUTPUT;
ali_set_dac_rate(state, 48000);
dmabuf->fmt = ALI5455_FMT_STEREO | ALI5455_FMT_16BIT;
dmabuf->trigger = PCM_ENABLE_OUTPUT;
ali_set_dac_rate(state, 48000);