diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-30 04:48:22 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-30 04:48:22 +0400 |
commit | 45b4539309d82ae04e6ed7de494ae194ca0755aa (patch) | |
tree | 2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /drivers/tty/tty_io.c | |
parent | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff) | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
download | linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.xz |
Merge 3.13-rc2 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r-- | drivers/tty/tty_io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3a1a01af9a80..c74a00ad7add 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2086,6 +2086,7 @@ retry_open: filp->f_op = &tty_fops; goto retry_open; } + clear_bit(TTY_HUPPED, &tty->flags); tty_unlock(tty); |