From 96f2c36f1264a25b05e95caf90b6119e2eab4392 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 19 Sep 2012 15:34:47 +0100
Subject: [PATCH] --- yaml --- r: 325770 b: refs/heads/master c:
 05fb79e45ee28b97a7cb74bd5ea3a88a8d13db1c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/tty/pty.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e014526406b..987066beebb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43eca0aef73cc6f0d37ad139f1cbb810e62e409d
+refs/heads/master: 05fb79e45ee28b97a7cb74bd5ea3a88a8d13db1c
diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c
index 2bace847eb39..a82b39939a9c 100644
--- a/trunk/drivers/tty/pty.c
+++ b/trunk/drivers/tty/pty.c
@@ -628,6 +628,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 	index = devpts_new_index(inode);
 	if (index < 0) {
 		retval = index;
+		mutex_unlock(&devpts_mutex);
 		goto err_file;
 	}
 
@@ -667,7 +668,6 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 	mutex_unlock(&tty_mutex);
 	devpts_kill_index(inode, index);
 err_file:
-        mutex_unlock(&devpts_mutex);
 	tty_free_file(filp);
 	return retval;
 }