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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
core
/
seq
/
seq_queue.c
diff --git
a/sound/core/seq/seq_queue.c
b/sound/core/seq/seq_queue.c
index
9cf20f0
..
9b87bb0
100644
(file)
--- a/
sound/core/seq/seq_queue.c
+++ b/
sound/core/seq/seq_queue.c
@@
-119,7
+119,7
@@
static struct snd_seq_queue *queue_new(int owner, int locked)
spin_lock_init(&q->owner_lock);
spin_lock_init(&q->check_lock);
spin_lock_init(&q->owner_lock);
spin_lock_init(&q->check_lock);
-
init_MUTEX
(&q->timer_mutex);
+
mutex_init
(&q->timer_mutex);
snd_use_lock_init(&q->use_lock);
q->queue = -1;
snd_use_lock_init(&q->use_lock);
q->queue = -1;
@@
-516,7
+516,7
@@
int snd_seq_queue_use(int queueid, int client, int use)
queue = queueptr(queueid);
if (queue == NULL)
return -EINVAL;
queue = queueptr(queueid);
if (queue == NULL)
return -EINVAL;
-
down
(&queue->timer_mutex);
+
mutex_lock
(&queue->timer_mutex);
if (use) {
if (!test_and_set_bit(client, queue->clients_bitmap))
queue->clients++;
if (use) {
if (!test_and_set_bit(client, queue->clients_bitmap))
queue->clients++;
@@
-531,7
+531,7
@@
int snd_seq_queue_use(int queueid, int client, int use)
} else {
snd_seq_timer_close(queue);
}
} else {
snd_seq_timer_close(queue);
}
-
up
(&queue->timer_mutex);
+
mutex_unlock
(&queue->timer_mutex);
queuefree(queue);
return 0;
}
queuefree(queue);
return 0;
}