patch-2.3.3 linux/drivers/macintosh/adb.c

Next file: linux/drivers/macintosh/mac_keyb.c
Previous file: linux/drivers/isdn/pcbit/pcbit.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.2/linux/drivers/macintosh/adb.c linux/drivers/macintosh/adb.c
@@ -375,7 +375,7 @@
 	spinlock_t	lock;
 	atomic_t	n_pending;
 	struct adb_request *completed;
-	struct wait_queue *wait_queue;
+	wait_queue_head_t wait_queue;
 	int		inuse;
 };
 
@@ -458,7 +458,7 @@
 	int ret;
 	struct adbdev_state *state = file->private_data;
 	struct adb_request *req;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 
 	if (count < 2)

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