From 2551250491244e527fdc5b8090d74ef16d4b0cc1 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 29 May 2012 13:45:01 +0100 Subject: [PATCH] --- yaml --- r: 308532 b: refs/heads/master c: d3ca8b64b97ef4dc54d7bb0b88bbc01a1fca8cb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/pty.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 03d7366edebf..919e879c31e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a01ee165a132fadb57659d26246e340d6ac53265 +refs/heads/master: d3ca8b64b97ef4dc54d7bb0b88bbc01a1fca8cb9 diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c index 59af3945ea85..65c7c62c7aae 100644 --- a/trunk/drivers/tty/pty.c +++ b/trunk/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 */