diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 16:56:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 16:56:36 -0500 |
commit | ce1000ddca01c81684da844be4676eac50a70c2a (patch) | |
tree | 3e9f8104785acf9ee22dbeb2897d0f4da2131691 /drivers/tty/pty.c | |
parent | 0ef1698e4d6282a1665207c40b115ec78fceda9b (diff) |
Revert "TTY: pty, remove superfluous ptm test"
This reverts commit a50f724a432997321cabb6c9e665c28e34850f78.
Sasha reported that this causes problems, so revert it.
Cc: Alan Cox <alan@linux.intel.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r-- | drivers/tty/pty.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index ddec9f3c3396..d505837b3478 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
@@ -54,7 +54,10 @@ static void pty_close(struct tty_struct *tty, struct file *filp) | |||
54 | wake_up_interruptible(&tty->link->write_wait); | 54 | wake_up_interruptible(&tty->link->write_wait); |
55 | if (tty->driver->subtype == PTY_TYPE_MASTER) { | 55 | if (tty->driver->subtype == PTY_TYPE_MASTER) { |
56 | set_bit(TTY_OTHER_CLOSED, &tty->flags); | 56 | set_bit(TTY_OTHER_CLOSED, &tty->flags); |
57 | devpts_pty_kill(tty->link); | 57 | #ifdef CONFIG_UNIX98_PTYS |
58 | if (tty->driver == ptm_driver) | ||
59 | devpts_pty_kill(tty->link); | ||
60 | #endif | ||
58 | tty_unlock(); | 61 | tty_unlock(); |
59 | tty_vhangup(tty->link); | 62 | tty_vhangup(tty->link); |
60 | tty_lock(); | 63 | tty_lock(); |