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

• Lines: 20
• Date: Wed May 12 13:27:37 1999
• Orig file: v2.3.0/linux/drivers/char/epca.c
• Orig date: Tue Mar 16 14:21:51 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/char/epca.c linux/drivers/char/epca.c
@@ -1268,7 +1268,7 @@
                            struct file *filp, struct channel *ch)
 { /* Begin block_til_ready */
 
-	struct wait_queue wait = {current, NULL};
+	DECLARE_WAITQUEUE(wait,current);
 	int	retval, do_clocal = 0;
 	unsigned long flags;
 
@@ -2236,8 +2236,8 @@
 		ch->blocked_open = 0;
 		ch->callout_termios = pc_callout.init_termios;
 		ch->normal_termios = pc_driver.init_termios;
-		ch->open_wait = 0;
-		ch->close_wait = 0;
+		init_waitqueue_head(&ch->open_wait);
+		init_waitqueue_head(&ch->close_wait);
 		ch->tmp_buf = kmalloc(ch->txbufsize,GFP_KERNEL);
 		if (!(ch->tmp_buf))
 		{