pty: Fix lock inversion

[~andy/linux] / drivers / tty / pty.c

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 59af3945ea859c334719fed6a41b4192a30f87f5..65c7c62c7aae9b2d81b936a45f0d67f659507324 100644 (file)
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -633,7 +633,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
        mutex_unlock(&devpts_mutex);
 
        mutex_lock(&tty_mutex);
-       mutex_lock(&devpts_mutex);
        tty = tty_init_dev(ptm_driver, index);
 
        if (IS_ERR(tty)) {
@@ -643,7 +642,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 
        /* The tty returned here is locked so we can safely
           drop the mutex */
-       mutex_unlock(&devpts_mutex);
        mutex_unlock(&tty_mutex);
 
        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */