diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 09:01:00 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 11:42:26 -0700 |
| commit | e0896b461ff2761c7a36d223f33d4f6d52c7340f (patch) | |
| tree | a95019535449a07a0fd0a6dc01fc352bd367a7d6 /drivers/tty | |
| parent | ab1842f10b18f847893dad5bfe513f1392cbe797 (diff) | |
tty: Reset itty for other pty
commit 64e377dcd7d75c241d614458e9619d3445de44ef upstream.
Commit 19ffd68f816878aed456d5e87697f43bd9e3bd2b
('pty: Remove redundant itty reset') introduced a regression
whereby the other pty's linkage is not cleared on teardown.
This triggers a false positive diagnostic in testing.
Properly reset the itty linkage.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/tty_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 6464029e486..44766821390 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1618,6 +1618,8 @@ static void release_tty(struct tty_struct *tty, int idx) tty_free_termios(tty); tty_driver_remove_tty(tty->driver, tty); tty->port->itty = NULL; + if (tty->link) + tty->link->port->itty = NULL; cancel_work_sync(&tty->port->buf.work); if (tty->link) |