diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 10:44:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 10:44:04 +0100 |
| commit | 67a681c0333be267b80a509151a4553760069bb2 (patch) | |
| tree | cbc73b3ab21d0ab843d9bd659fe185f9986be5bb /drivers/tty | |
| parent | dafe3258c5449e2697097285c37c761915053eae (diff) | |
| parent | 2a0458773656240cf6fa97f1126c92dcddf8ab90 (diff) | |
| download | juno-67a681c0333be267b80a509151a4553760069bb2.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/tty_io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 44766821390..59d26ef538d 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -850,7 +850,8 @@ void disassociate_ctty(int on_exit) struct pid *tty_pgrp = tty_get_pgrp(tty); if (tty_pgrp) { kill_pgrp(tty_pgrp, SIGHUP, on_exit); - kill_pgrp(tty_pgrp, SIGCONT, on_exit); + if (!on_exit) + kill_pgrp(tty_pgrp, SIGCONT, on_exit); put_pid(tty_pgrp); } } |