From 02078e11f0d65bdc778d538fdbd2b26aa5dccfe0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 16 Nov 2011 16:27:08 +0100 Subject: [PATCH] --- yaml --- r: 275785 b: refs/heads/master c: 300420722e0734a4254f3b634e0f82664495d210 h: refs/heads/master i: 275783: 08256b566282e1f4e28b8a8eb9d005f232a07cc0 v: v3 --- [refs] | 2 +- trunk/drivers/tty/tty_ldisc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index de6f04dec455..d39d1486ea57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df92d0561de364de53c42abc5d43e04ab6f326a5 +refs/heads/master: 300420722e0734a4254f3b634e0f82664495d210 diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c index 534d176a78ed..a69a755035b6 100644 --- a/trunk/drivers/tty/tty_ldisc.c +++ b/trunk/drivers/tty/tty_ldisc.c @@ -763,8 +763,6 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc) if (IS_ERR(ld)) return -1; - WARN_ON_ONCE(tty_ldisc_wait_idle(tty, 5 * HZ)); - tty_ldisc_close(tty, tty->ldisc); tty_ldisc_put(tty->ldisc); tty->ldisc = NULL; @@ -848,6 +846,8 @@ void tty_ldisc_hangup(struct tty_struct *tty) it means auditing a lot of other paths so this is a FIXME */ if (tty->ldisc) { /* Not yet closed */ + WARN_ON_ONCE(tty_ldisc_wait_idle(tty, 5 * HZ)); + if (reset == 0) { if (!tty_ldisc_reinit(tty, tty->termios->c_line))