diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-10-03 16:44:52 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-10-03 16:44:52 +0000 |
| commit | 24c386b577f126bce761c7288e987ae93c36aa88 (patch) | |
| tree | 99166e0d499a2be11543cc5dd9774c63a12466eb /sys/arch/hppa/dev | |
| parent | e43c66ff4e929d0beb6716fb882523dc136b8c0c (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/arch/hppa/dev')
| -rw-r--r-- | sys/arch/hppa/dev/pdc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c index d9e3dd00ba0..4181c5b8e89 100644 --- a/sys/arch/hppa/dev/pdc.c +++ b/sys/arch/hppa/dev/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.25 2003/05/14 23:18:09 miod Exp $ */ +/* $OpenBSD: pdc.c,v 1.26 2003/10/03 16:44:49 miod Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -205,8 +205,9 @@ pdcopen(dev, flag, mode, p) if (sc->sc_tty) tp = sc->sc_tty; - else - tty_attach(tp = sc->sc_tty = ttymalloc()); + else { + tp = sc->sc_tty = ttymalloc(); + } tp->t_oproc = pdcstart; tp->t_param = pdcparam; |