diff options
| author | Shachar Shemesh <shachar@liveu.tv> | 2012-07-10 07:54:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-12 14:54:14 -0700 |
| commit | 40c9f61eae9098212b6906f29f30f08f7a19b5e2 (patch) | |
| tree | ace42166f5546e2cd882813085567ffb27812909 /drivers/tty/tty_ldisc.c | |
| parent | eb26dfe8aa7eeb5a5aa0b7574550125f8aa4c3b3 (diff) | |
| download | op-kernel-dev-40c9f61eae9098212b6906f29f30f08f7a19b5e2.zip op-kernel-dev-40c9f61eae9098212b6906f29f30f08f7a19b5e2.tar.gz | |
tty ldisc: Close/Reopen race prevention should check the proper flag
Commit acfa747b introduced the TTY_HUPPING flag to distinguish
closed TTY from currently closing ones. The test in tty_set_ldisc
still remained pointing at the old flag. This causes pppd to
sometimes lapse into uninterruptible sleep when killed and
restarted.
Signed-off-by: Shachar Shemesh <shachar@liveu.tv>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
| -rw-r--r-- | drivers/tty/tty_ldisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index ba8be39..847f7ed 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c @@ -659,7 +659,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) goto enable; } - if (test_bit(TTY_HUPPED, &tty->flags)) { + if (test_bit(TTY_HUPPING, &tty->flags)) { /* We were raced by the hangup method. It will have stomped the ldisc data and closed the ldisc down */ clear_bit(TTY_LDISC_CHANGING, &tty->flags); |
