aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2018-03-26 02:31:53 +0000
committerAlex Shi <alex.shi@linaro.org>2018-03-26 02:31:53 +0000
commitc5833b96030f9e06cf7c19dd4f99d3b55985eb8c (patch)
tree9587bb407acebb17bbd8a33d2d9c53ecbe1ab442 /drivers/tty
parent78c39820dc30c73f5b69c3fe2269ad9b0840a61a (diff)
parentb766b14a48de577e5060e4d8762f1e4a34229d2b (diff)
Merge tag 'v4.4.124' into linux-linaro-lsk-v4.4lsk-v4.4-18.03
This is the 4.4.124 stable release
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 1bb629ab8ecc..a638c1738547 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1694,6 +1694,8 @@ static void release_tty(struct tty_struct *tty, int idx)
if (tty->link)
tty->link->port->itty = NULL;
tty_buffer_cancel_work(tty->port);
+ if (tty->link)
+ tty_buffer_cancel_work(tty->link->port);
tty_kref_put(tty->link);
tty_kref_put(tty);