summaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_ldisc.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-03-11 21:44:30 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-19 00:38:58 +0100
commit977066e7587b1b57023a048c0ba754955ea3e7bc (patch)
tree3e27794f5d95f5dc0f9e3095546afd752c23f24f /drivers/tty/tty_ldisc.c
parenttty: Halt both ldiscs concurrently (diff)
downloadlinux-977066e7587b1b57023a048c0ba754955ea3e7bc.tar.xz
linux-977066e7587b1b57023a048c0ba754955ea3e7bc.zip
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>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
-rw-r--r--drivers/tty/tty_ldisc.c2
1 files changed, 1 insertions, 1 deletions
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);
}