---

yaml --- r: 308532 b: refs/heads/master c: d3ca8b6 h: refs/heads/master v: v3
git-mirror · May 29, 2012 · 2551250 · 2551250
1 parent 1815b08
commit 2551250
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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 */