aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/pty.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/pty.c')
-rw-r--r--drivers/tty/pty.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 59af3945ea85..65c7c62c7aae 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -633,7 +633,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
633 mutex_unlock(&devpts_mutex); 633 mutex_unlock(&devpts_mutex);
634 634
635 mutex_lock(&tty_mutex); 635 mutex_lock(&tty_mutex);
636 mutex_lock(&devpts_mutex);
637 tty = tty_init_dev(ptm_driver, index); 636 tty = tty_init_dev(ptm_driver, index);
638 637
639 if (IS_ERR(tty)) { 638 if (IS_ERR(tty)) {
@@ -643,7 +642,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
643 642
644 /* The tty returned here is locked so we can safely 643 /* The tty returned here is locked so we can safely
645 drop the mutex */ 644 drop the mutex */
646 mutex_unlock(&devpts_mutex);
647 mutex_unlock(&tty_mutex); 645 mutex_unlock(&tty_mutex);
648 646
649 set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */ 647 set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */