Commit 4d06eb74 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA CVS update

D:2003/09/30 11:15:44
C:RawMidi Midlevel
A:Takashi Iwai <tiwai@suse.de>
F:core/rawmidi.c:1.38->1.39 
L:fixed typos (open_lock -> open_mutex).
parent 2f1781aa
...@@ -403,7 +403,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) ...@@ -403,7 +403,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
} }
init_waitqueue_entry(&wait, current); init_waitqueue_entry(&wait, current);
add_wait_queue(&rmidi->open_wait, &wait); add_wait_queue(&rmidi->open_wait, &wait);
down(&rmidi->open_lock); down(&rmidi->open_mutex);
while (1) { while (1) {
subdevice = -1; subdevice = -1;
down_read(&card->controls_rwsem); down_read(&card->controls_rwsem);
...@@ -426,9 +426,9 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) ...@@ -426,9 +426,9 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
} else } else
break; break;
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
up(&rmidi->open_lock); up(&rmidi->open_mutex);
schedule(); schedule();
down(&rmidi->open_lock); down(&rmidi->open_mutex);
if (signal_pending(current)) { if (signal_pending(current)) {
err = -ERESTARTSYS; err = -ERESTARTSYS;
break; break;
...@@ -447,7 +447,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) ...@@ -447,7 +447,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
snd_card_file_remove(card, file); snd_card_file_remove(card, file);
snd_magic_kfree(rawmidi_file); snd_magic_kfree(rawmidi_file);
} }
up(&rmidi->open_lock); up(&rmidi->open_mutex);
return err; return err;
} }
......
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