patch-2.3.1 linux/drivers/sbus/char/sunmouse.c

• Lines: 27
• Date: Wed May 12 08:41:15 1999
• Orig file: v2.3.0/linux/drivers/sbus/char/sunmouse.c
• Orig date: Thu Apr 22 19:24:51 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/sbus/char/sunmouse.c linux/drivers/sbus/char/sunmouse.c
@@ -73,7 +73,7 @@
 	int ready;		       /* set if there if data is available */
 	int active;		       /* set if device is open */
         int vuid_mode;	               /* VUID_NATIVE or VUID_FIRM_EVENT */
-	struct wait_queue *proc_list;
+	wait_queue_head_t proc_list;
 	struct fasync_struct *fasync;
 	
 	/* The event/stream queue */
@@ -368,7 +368,7 @@
 sun_mouse_read(struct file *file, char *buffer,
 	       size_t count, loff_t *ppos)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 
 	if (queue_empty ()){
 		if (file->f_flags & O_NONBLOCK)
@@ -503,7 +503,7 @@
 	misc_register (&sun_mouse_mouse);
 	sunmouse.delta_x = sunmouse.delta_y = 0;
 	sunmouse.button_state = 0x80;
-	sunmouse.proc_list = NULL;
+	init_waitqueue_head(&sunmouse.proc_list);
 	sunmouse.byte = 69;
 	return 0;
 }