summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2008-04-12 14:57:16 +0000
committerkettenis <kettenis@openbsd.org>2008-04-12 14:57:16 +0000
commit9c8ff5be0304b4d568a9792a4bb7d7a3c061a0ce (patch)
tree726086d93f525c0d7e33c061dd2a079d373d4f46
parentjust use an incremented int to calculate drawable ids. This is simpler (diff)
downloadwireguard-openbsd-9c8ff5be0304b4d568a9792a4bb7d7a3c061a0ce.tar.xz
wireguard-openbsd-9c8ff5be0304b4d568a9792a4bb7d7a3c061a0ce.zip
Tighten check for consoleness by comparing comconsiot as well as comconsaddr.
ok deraadt@
-rw-r--r--sys/dev/ic/com_subr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/com_subr.c b/sys/dev/ic/com_subr.c
index ea6c15aa63e..b3a1cba0087 100644
--- a/sys/dev/ic/com_subr.c
+++ b/sys/dev/ic/com_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_subr.c,v 1.11 2007/10/22 14:11:44 fgsch Exp $ */
+/* $OpenBSD: com_subr.c,v 1.12 2008/04/12 14:57:16 kettenis Exp $ */
/*
* Copyright (c) 1997 - 1999, Jason Downs. All rights reserved.
@@ -150,7 +150,7 @@ com_attach_subr(sc)
bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
#ifdef COM_CONSOLE
- if (sc->sc_iobase == comconsaddr) {
+ if (sc->sc_iot == comconsiot && sc->sc_iobase == comconsaddr) {
comconsattached = 1;
delay(10000); /* wait for output to finish */
SET(sc->sc_hwflags, COM_HW_CONSOLE);