aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-24 13:55:54 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-24 13:55:54 -0800
commit0ef1698e4d6282a1665207c40b115ec78fceda9b (patch)
tree61df100f821a49b04bd4b2914fcb9998ee88e37c /drivers/tty/tty_io.c
parent6dc01aa65306fe46b7ba38db51fad4ed81c23d00 (diff)
downloadkernel_goldelico_gta04-0ef1698e4d6282a1665207c40b115ec78fceda9b.zip
kernel_goldelico_gta04-0ef1698e4d6282a1665207c40b115ec78fceda9b.tar.gz
kernel_goldelico_gta04-0ef1698e4d6282a1665207c40b115ec78fceda9b.tar.bz2
Revert "TTY: get rid of BTM around devpts_*"
This reverts commit d3bda5298aad98c7a27678bdd0dd9d008ab9e685. Sasha reported that this causes problems, so revert it. Cc: Sasha Levin <levinsasha928@gmail.com> Cc: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index ea7ebe2..44736f9 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1789,11 +1789,11 @@ int tty_release(struct inode *inode, struct file *filp)
* the slots and preserving the termios structure.
*/
release_tty(tty, idx);
- tty_unlock();
/* Make this pty number available for reallocation */
if (devpts)
devpts_kill_index(inode, idx);
+ tty_unlock();
return 0;
}