diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 16:55:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 16:55:54 -0500 |
commit | 0ef1698e4d6282a1665207c40b115ec78fceda9b (patch) | |
tree | 61df100f821a49b04bd4b2914fcb9998ee88e37c /drivers/tty/tty_io.c | |
parent | 6dc01aa65306fe46b7ba38db51fad4ed81c23d00 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index ea7ebe22a16c..44736f9e61d7 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) | |||
1789 | * the slots and preserving the termios structure. | 1789 | * the slots and preserving the termios structure. |
1790 | */ | 1790 | */ |
1791 | release_tty(tty, idx); | 1791 | release_tty(tty, idx); |
1792 | tty_unlock(); | ||
1793 | 1792 | ||
1794 | /* Make this pty number available for reallocation */ | 1793 | /* Make this pty number available for reallocation */ |
1795 | if (devpts) | 1794 | if (devpts) |
1796 | devpts_kill_index(inode, idx); | 1795 | devpts_kill_index(inode, idx); |
1796 | tty_unlock(); | ||
1797 | return 0; | 1797 | return 0; |
1798 | } | 1798 | } |
1799 | 1799 | ||