summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-06-15 09:01:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 12:59:35 -0700
commit64e377dcd7d75c241d614458e9619d3445de44ef (patch)
treee2a007a7920c5079d4e5ffbc4705fe23e08397dc /drivers/tty
parent7879a9f9fd4ff4a88b3c51f4ab6718dc7f86ed86 (diff)
downloadop-kernel-dev-64e377dcd7d75c241d614458e9619d3445de44ef.zip
op-kernel-dev-64e377dcd7d75c241d614458e9619d3445de44ef.tar.gz
tty: Reset itty for other pty
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> Cc: stable <stable@vger.kernel.org> # 3.10 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/tty_io.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index bd88007..366af83 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)
OpenPOWER on IntegriCloud