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

• Lines: 28
• Date: Wed May 12 13:27:37 1999
• Orig file: v2.3.0/linux/drivers/char/isicom.c
• Orig date: Fri May 7 11:05:30 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/char/isicom.c linux/drivers/char/isicom.c
@@ -80,7 +80,7 @@
 static void isicom_start(struct tty_struct * tty);
 
 static unsigned char * tmp_buf = 0;
-static struct semaphore tmp_buf_sem = MUTEX;
+static DECLARE_MUTEX(tmp_buf_sem);
 
 /*   baud index mappings from linux defns to isi */
 
@@ -870,7 +870,7 @@
 static int block_til_ready(struct tty_struct * tty, struct file * filp, struct isi_port * port) 
 {
 	int do_clocal = 0, retval;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 
 	/* block if port is in the process of being closed */
 
@@ -1858,7 +1858,8 @@
 		 	port->bh_tqueue.routine = isicom_bottomhalf;
 		 	port->bh_tqueue.data = port;
 		 	port->status = 0;
-		 				
+			init_waitqueue_head(&port->open_wait);	 				
+			init_waitqueue_head(&port->close_wait);
 			/*  . . .  */
  		}
 	}