From d1a7a199e2889b26006decc677badfc77e978acf Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Tue, 25 Dec 2012 23:02:48 +0100 Subject: [PATCH] --- yaml --- r: 354796 b: refs/heads/master c: 852e4a8152b427c3f318bb0e1b5e938d64dcdc32 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/tty_ldisc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 871eca71f459..6542a6335cbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7277b2a1c687b728a4ec0511d2ae076aed6ed5b4 +refs/heads/master: 852e4a8152b427c3f318bb0e1b5e938d64dcdc32 diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c index e96d1876bd62..d794087c327e 100644 --- a/trunk/drivers/tty/tty_ldisc.c +++ b/trunk/drivers/tty/tty_ldisc.c @@ -936,17 +936,17 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty) * race with the set_ldisc code path. */ - tty_lock_pair(tty, o_tty); tty_ldisc_halt(tty); - tty_ldisc_flush_works(tty); - if (o_tty) { + if (o_tty) tty_ldisc_halt(o_tty); + + tty_ldisc_flush_works(tty); + if (o_tty) tty_ldisc_flush_works(o_tty); - } + tty_lock_pair(tty, o_tty); /* This will need doing differently if we need to lock */ tty_ldisc_kill(tty); - if (o_tty) tty_ldisc_kill(o_tty);