patch-2.1.36 linux/drivers/char/esp.c

• Lines: 35
• Date: Tue Apr 22 22:42:47 1997
• Orig file: v2.1.35/linux/drivers/char/esp.c
• Orig date: Fri Apr 4 08:52:19 1997

diff -u --recursive --new-file v2.1.35/linux/drivers/char/esp.c linux/drivers/char/esp.c
@@ -55,6 +55,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/mm.h>
+#include <linux/init.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -2312,7 +2313,8 @@
  * number, and identifies which options were configured into this
  * driver.
  */
-static void show_serial_version(void)
+ 
+static _INLINE_ void show_serial_version(void)
 {
  	printk(KERN_INFO "%s version %s (DMA %u, trigger level %u)\n",
 		serial_name, serial_version, dma, trigger);
@@ -2380,7 +2382,7 @@
 /*
  * The serial driver boot-time initialization code!
  */
-int espserial_init(void)
+__initfunc(int espserial_init(void))
 {
 	int i, offset;
 	int region_start;
@@ -2565,6 +2567,7 @@
 	/* printk("Unloading %s: version %s\n", serial_name, serial_version); */
 	save_flags(flags);
 	cli();
+	remove_bh(ESP_BH);
 	if ((e1 = tty_unregister_driver(&esp_driver)))
 		printk("SERIAL: failed to unregister serial driver (%d)\n",
 		       e1);