diff options
| author | grog <grog@FreeBSD.org> | 1999-06-19 08:14:56 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 1999-06-19 08:14:56 +0000 |
| commit | 06c3ad86b4e89c5b87ac4f2ab7b97788b5ac27ca (patch) | |
| tree | ba5d0548f9eff47f6209b1ee3b3b906f614a5ed6 /sys/dev/sio/sio.c | |
| parent | a916e56dd313e5c62de2cff5469fc1d6e7e5eb6a (diff) | |
| download | FreeBSD-src-06c3ad86b4e89c5b87ac4f2ab7b97788b5ac27ca.zip FreeBSD-src-06c3ad86b4e89c5b87ac4f2ab7b97788b5ac27ca.tar.gz | |
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
Diffstat (limited to 'sys/dev/sio/sio.c')
| -rw-r--r-- | sys/dev/sio/sio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 4665d88..7cb6eba 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; |
