patch-2.1.16 linux/drivers/char/serial.c

• Lines: 33
• Date: Wed Dec 18 11:45:43 1996
• Orig file: v2.1.15/linux/drivers/char/serial.c
• Orig date: Thu Dec 12 19:37:01 1996

diff -u --recursive --new-file v2.1.15/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -2365,6 +2365,9 @@
 	if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent"))
 		return;
 
+	if (info->state->type == PORT_UNKNOWN)
+		return;
+
 	orig_jiffies = jiffies;
 	/*
 	 * Set the check interval to be 1/5 of the estimated time to
@@ -2817,9 +2820,6 @@
 	info->port = state->port;
 	info->flags = state->flags;
 
-	if(check_region(info->port,8))
-		return;		/* Area in use */
-
 	save_flags(flags); cli();
 	
 	/*
@@ -3102,6 +3102,12 @@
 	state->irq = req->irq;
 	state->port = req->port;
 	state->flags = req->flags;
+
+	if (check_region(state->port,8)) {
+		restore_flags(flags);
+		printk("register_serial(): I/O region in use\n");
+		return -1;		/* Area in use */
+	}
 	autoconfig(state);
 	if (state->type == PORT_UNKNOWN) {
 		restore_flags(flags);