summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/tty.c')
-rw-r--r--sys/kern/tty.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 2ce8c8a..2670c9e 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -223,7 +223,8 @@ ttyopen(device, tp)
bzero(&tp->t_winsize, sizeof(tp->t_winsize));
}
/* XXX don't hang forever on output */
- tp->t_timeout = drainwait*hz;
+ if (tp->t_timeout < 0)
+ tp->t_timeout = drainwait*hz;
ttsetwater(tp);
splx(s);
return (0);
@@ -2402,6 +2403,7 @@ ttymalloc(tp)
return(tp);
tp = malloc(sizeof *tp, M_TTYS, M_WAITOK);
bzero(tp, sizeof *tp);
+ tp->t_timeout = -1;
ttyregister(tp);
return (tp);
}
OpenPOWER on IntegriCloud