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

• Lines: 40
• Date: Tue Jan 14 12:52:46 1997
• Orig file: v2.1.20/linux/drivers/char/serial.c
• Orig date: Mon Dec 30 15:39:08 1996

diff -u --recursive --new-file v2.1.20/linux/drivers/char/serial.c linux/drivers/char/serial.c
@@ -25,6 +25,7 @@
  * 	int rs_open(struct tty_struct * tty, struct file * filp)
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
@@ -35,7 +36,6 @@
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
-#include <linux/config.h>
 #include <linux/major.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
@@ -2931,6 +2931,11 @@
 	}
 	state->xmit_fifo_size =	uart_config[state->type].dfl_xmit_fifo_size;
 
+	if (state->type == PORT_UNKNOWN) {
+		restore_flags(flags);
+		return;
+	}
+
 	request_region(info->port,8,"serial(auto)");
 
 	/*
@@ -3099,11 +3104,6 @@
 	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);