patch-2.3.1 linux/drivers/char/pc_keyb.c

• Lines: 18
• Date: Tue May 11 14:37:40 1999
• Orig file: v2.3.0/linux/drivers/char/pc_keyb.c
• Orig date: Mon Apr 26 13:43:01 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/char/pc_keyb.c linux/drivers/char/pc_keyb.c
@@ -864,7 +864,7 @@
 static ssize_t read_aux(struct file * file, char * buffer,
 			size_t count, loff_t *ppos)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	ssize_t i = count;
 	unsigned char c;
 
@@ -964,7 +964,7 @@
 	queue = (struct aux_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
 	memset(queue, 0, sizeof(*queue));
 	queue->head = queue->tail = 0;
-	queue->proc_list = NULL;
+	init_waitqueue_head(&queue->proc_list);
 
 #ifdef INITIALIZE_MOUSE
 	kbd_write(KBD_CNTL_REG, KBD_CCMD_MOUSE_ENABLE);	/* Enable Aux. */