tty: make n_tty_read() always abort if hangup is in progress

[pandora-kernel.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 304f58e..8e31696 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1809,6 +1809,12 @@ do_it_again:
                        }
                        if (tty_hung_up_p(file))
                                break;
+                       /*
+                        * Abort readers for ttys which never actually
+                        * get hung up.  See __tty_hangup().
+                        */
+                       if (test_bit(TTY_HUPPING, &tty->flags))
+                               break;
                        if (!timeout)
                                break;
                        if (file->f_flags & O_NONBLOCK) {