patch-2.1.56 linux/drivers/pnp/parport_probe.c

• Lines: 29
• Date: Tue Sep 16 12:22:45 1997
• Orig file: v2.1.55/linux/drivers/pnp/parport_probe.c
• Orig date: Wed Sep 3 20:52:42 1997

diff -u --recursive --new-file v2.1.55/linux/drivers/pnp/parport_probe.c linux/drivers/pnp/parport_probe.c
@@ -84,13 +84,13 @@
 	return count; 
 }
 
-static struct wait_queue *wait_q = NULL;
+static struct wait_queue *wait_q;
 
 static void wakeup(void *ref)
 {
 	struct pardevice **dev = (struct pardevice **)ref;
 	
-	if (!wait_q || parport_claim(*dev))
+	if (!waitqueue_active || parport_claim(*dev))
 		return;
 
 	wake_up(&wait_q);
@@ -108,10 +108,9 @@
 		return -EINVAL;
 	}
 
-	if (parport_claim(dev)) {
+	init_waitqueue (&wait_q);
+	if (parport_claim(dev))
 		sleep_on(&wait_q);
-		wait_q = NULL;
-	}
 
 	switch (parport_ieee1284_nibble_mode_ok(port, 4)) {
 	case 1: