diff --git a/[refs] b/[refs]
index eef44fd29485..24ba101a49e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa90e1c935472281de314e6d7c9a37db9cbc2e4e
+refs/heads/master: 1177c0efc04d032644895b8d757f55b433912596
diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c
index 7613f95f2d6b..2feea63d497a 100644
--- a/trunk/drivers/tty/pty.c
+++ b/trunk/drivers/tty/pty.c
@@ -686,15 +686,15 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 
 	retval = devpts_pty_new(inode, tty->link);
 	if (retval)
-		goto out1;
+		goto err_release;
 
 	retval = ptm_driver->ops->open(tty, filp);
 	if (retval)
-		goto out2;
-out1:
+		goto err_release;
+
 	tty_unlock();
-	return retval;
-out2:
+	return 0;
+err_release:
 	tty_unlock();
 	tty_release(inode, filp);
 	return retval;