patch-2.3.1 linux/drivers/sound/sequencer.c

Next file: linux/drivers/sound/sonicvibes.c
Previous file: linux/drivers/sound/msnd_pinnacle.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/drivers/sound/sequencer.c linux/drivers/sound/sequencer.c
@@ -53,8 +53,8 @@
 #define SEQ_2	2
 static int      seq_mode = SEQ_1;
 
-static struct wait_queue *seq_sleeper = NULL;
-static struct wait_queue *midi_sleeper = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(seq_sleeper);
+static DECLARE_WAIT_QUEUE_HEAD(midi_sleeper);
 
 static int      midi_opened[MAX_MIDI_DEV] = {
 	0
@@ -1117,8 +1117,8 @@
 	if (seq_mode == SEQ_2)
 		tmr->open(tmr_no, seq_mode);
 
- 	init_waitqueue(&seq_sleeper);
- 	init_waitqueue(&midi_sleeper);
+ 	init_waitqueue_head(&seq_sleeper);
+ 	init_waitqueue_head(&midi_sleeper);
 	output_threshold = SEQ_MAX_QUEUE / 2;
 
 	return 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)