diff options
Diffstat (limited to 'drivers/tty/pty.c')
| -rw-r--r-- | drivers/tty/pty.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 39afd04..ddec9f3 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -54,8 +54,8 @@ static void pty_close(struct tty_struct *tty, struct file *filp) wake_up_interruptible(&tty->link->write_wait); if (tty->driver->subtype == PTY_TYPE_MASTER) { set_bit(TTY_OTHER_CLOSED, &tty->flags); - tty_unlock(); devpts_pty_kill(tty->link); + tty_unlock(); tty_vhangup(tty->link); tty_lock(); } @@ -613,7 +613,9 @@ static int ptmx_open(struct inode *inode, struct file *filp) return retval; /* find a device that is not in use. */ + tty_lock(); index = devpts_new_index(inode); + tty_unlock(); if (index < 0) { retval = index; goto err_file; @@ -648,8 +650,8 @@ err_release: tty_release(inode, filp); return retval; out: - tty_unlock(); devpts_kill_index(inode, index); + tty_unlock(); err_file: tty_free_file(filp); return retval; |