From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 11 Mar 2013 20:44:30 +0000 (-0400)
Subject: tty: Wait for SAK work before waiting for hangup work
X-Git-Tag: firefly_0821_release~3680^2~673^2~66
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=977066e7587b1b57023a048c0ba754955ea3e7bc;p=firefly-linux-kernel-4.4.55.git

tty: Wait for SAK work before waiting for hangup work

SAK work may schedule hangup work (if TTY_SOFT_SAK is defined), thus
SAK work must be flushed before hangup work.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 77120911e016..37671fcc7e4c 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -506,8 +506,8 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
  */
 static void tty_ldisc_flush_works(struct tty_struct *tty)
 {
-	flush_work(&tty->hangup_work);
 	flush_work(&tty->SAK_work);
+	flush_work(&tty->hangup_work);
 	flush_work(&tty->port->buf.work);
 }