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

• Lines: 18
• Date: Wed May 12 13:27:37 1999
• Orig file: v2.3.0/linux/drivers/char/joystick/joystick.c
• Orig date: Tue Dec 1 19:05:05 1998

diff -u --recursive --new-file v2.3.0/linux/drivers/char/joystick/joystick.c linux/drivers/char/joystick/joystick.c
@@ -491,7 +491,7 @@
 static int js_read(struct inode *inode, struct file *file, char *buf, int count)
 #endif
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	struct js_event *buff = (void *) buf;
 	struct js_list *curl;
 	struct js_dev *jd;
@@ -1081,7 +1081,7 @@
 	curd->next = NULL;
 	curd->list = NULL;
 	curd->port = port;
-	curd->wait = NULL;
+	init_waitqueue_head(&curd->wait);
 	curd->open = open;
 	curd->close = close;