diff --git a/[refs] b/[refs] index f26b4fa2f39f..b6205ceb8172 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86a96538178f923aa1aa43c1e7cfec5951df7f8a +refs/heads/master: 4f8f9d66cdac4845409f7520e4f287a1907a6bf9 diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index ddfa529936e8..edcb7e471f02 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -2838,8 +2838,8 @@ static int ptmx_open(struct inode *inode, struct file *filp) filp->private_data = tty; file_move(filp, &tty->tty_files); - retval = -ENOMEM; - if (devpts_pty_new(tty->link)) + retval = devpts_pty_new(tty->link); + if (retval) goto out1; check_tty_count(tty, "ptmx_open");