From bd87150cd2ec0dc627d9893d9de83124a0949f12 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Thu, 4 Mar 1999 10:37:30 +0000
Subject: [PATCH] Sync with sys/i386/isa/sio.c revision 1.229.

---
 sys/pc98/cbus/sio.c | 10 +++++++---
 sys/pc98/pc98/sio.c | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 9492ea301f86..07d8f11db8e0 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $
+ *	$Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1472,6 +1472,9 @@ sioattach(isdp)
 	dev_t		dev;
 #ifdef COM_ESP
 	Port_t		*espp;
+#endif
+#ifdef COM_MULTIPORT
+	struct isa_device	*idev;
 #endif
 	Port_t		iobase;
 	int		s;
@@ -1762,8 +1765,9 @@ determined_type: ;
 		if (unit == COM_MPMASTER(isdp))
 			printf(" master");
 		printf(")");
-		com->no_irq = find_isadev(isa_devtab_tty, &siodriver,
-					  COM_MPMASTER(isdp))->id_irq == 0;
+		idev = find_isadev(isa_devtab_tty, &siodriver,
+				   COM_MPMASTER(isdp));  
+		com->no_irq = (idev == NULL || idev->id_irq == 0);
 	 }
 #endif /* COM_MULTIPORT */
 #ifdef PC98
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 9492ea301f86..07d8f11db8e0 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $
+ *	$Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1472,6 +1472,9 @@ sioattach(isdp)
 	dev_t		dev;
 #ifdef COM_ESP
 	Port_t		*espp;
+#endif
+#ifdef COM_MULTIPORT
+	struct isa_device	*idev;
 #endif
 	Port_t		iobase;
 	int		s;
@@ -1762,8 +1765,9 @@ determined_type: ;
 		if (unit == COM_MPMASTER(isdp))
 			printf(" master");
 		printf(")");
-		com->no_irq = find_isadev(isa_devtab_tty, &siodriver,
-					  COM_MPMASTER(isdp))->id_irq == 0;
+		idev = find_isadev(isa_devtab_tty, &siodriver,
+				   COM_MPMASTER(isdp));  
+		com->no_irq = (idev == NULL || idev->id_irq == 0);
 	 }
 #endif /* COM_MULTIPORT */
 #ifdef PC98