summaryrefslogtreecommitdiff
path: root/sys/dev/sbus/spif.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-10-03 16:44:52 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-10-03 16:44:52 +0000
commit24c386b577f126bce761c7288e987ae93c36aa88 (patch)
tree99166e0d499a2be11543cc5dd9774c63a12466eb /sys/dev/sbus/spif.c
parente43c66ff4e929d0beb6716fb882523dc136b8c0c (diff)
Merge tty_attach() in ttymalloc() and tty_detach() in ttyfree(). The need for
separate tty registering is gone now that sparc has switched to wscons, and this makes the code less error-prone. Also, remove tests for ttymalloc() failure, since it uses M_WAITOK. ok millert@ deraadt@, tested by various people as well besides me...
Diffstat (limited to 'sys/dev/sbus/spif.c')
-rw-r--r--sys/dev/sbus/spif.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index 1bcbd07e547..b83cf859451 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spif.c,v 1.11 2003/09/23 16:51:12 millert Exp $ */
+/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
* Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -312,9 +312,6 @@ sttyattach(parent, dev, aux)
DTR_WRITE(sc, port, 0);
tp = ttymalloc();
- if (tp == NULL)
- break;
- tty_attach(tp);
tp->t_oproc = stty_start;
tp->t_param = stty_param;