summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-08 16:28:18 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-08-08 16:28:18 +0000
commit6f4240a0ba0055aeab306357e08973f464c132b7 (patch)
tree284df85dfa39ee132149b1579bec83be94709300 /sys
parentb2b8718ef4219224fcaf1ea3d65b3a018231b3eb (diff)
pasto from pccom.c
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/com.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 237a65fb7dc..412f7495a12 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.49 1999/08/08 15:08:24 niklas Exp $ */
+/* $OpenBSD: com.c,v 1.50 1999/08/08 16:28:17 niklas Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*-
@@ -628,9 +628,6 @@ com_detach(self, flags)
mn |= 0x80;
vdevgone(maj, mn, mn, VCHR);
- /* Free the receive buffer. */
- free(sc->sc_rbuf, M_DEVBUF);
-
/* Detach and free the tty. */
if (sc->sc_tty) {
tty_detach(sc->sc_tty);
@@ -652,14 +649,14 @@ com_activate(self, act)
struct com_softc *sc = (struct com_softc *)self;
int s, rv = 0;
- s = splserial();
+ s = spltty();
switch (act) {
case DVACT_ACTIVATE:
rv = EOPNOTSUPP;
break;
case DVACT_DEACTIVATE:
- if (sc->sc_hwflags & (COM_HW_CONSOLE|COM_HW_KGDB)) {
+ if (sc->sc_hwflags & COM_HW_CONSOLE) {
rv = EBUSY;
break;
}