From 89bf63adaad1ec96524765b49bc263d2b10f1c6e Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Sat, 19 Jun 1999 08:14:56 +0000
Subject: sioprobe: Don't try to initialize disabled ports.  In particular,
 attempting to initialize sio3 caused problems with ATI video boards, which
 cleverly share the I/O space.

PR: kern/12295
---
 sys/dev/sio/sio.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/dev/sio/sio.c')

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 4665d88975df..7cb6ebada1e0 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
+ *	$Id: sio.c,v 1.247 1999/06/15 22:15:10 mckusick Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -69,6 +69,7 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 #include <machine/bus.h>
+#include <sys/bus_private.h>
 #include <sys/rman.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
@@ -639,7 +640,8 @@ sioprobe(dev)
 		devclass_get_devices(sio_devclass, &devs, &count);
 		for (i = 0; i < count; i++) {
 			xdev = devs[i];
-			outb(isa_get_port(xdev) + com_mcr, 0);
+			if (xdev->flags & DF_ENABLED)
+				outb(isa_get_port(xdev) + com_mcr, 0);
 		}
 		free(devs, M_TEMP);
 		already_init = TRUE;
-- 
cgit v1.2.3