tty: Finish fixing up the init_dev interface to use ERR_PTR

[deliverable/linux.git] / drivers / char / pty.c

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 4e6490bda7511eb239e5d97b6230a3faa2cbc3b0..c98450023030304611dda20532098bb4caf6bd92 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -501,11 +501,13 @@ static int __ptmx_open(struct inode *inode, struct file *filp)
                return index;
 
        mutex_lock(&tty_mutex);
-       retval = tty_init_dev(ptm_driver, index, &tty, 1);
+       tty = tty_init_dev(ptm_driver, index, 1);
        mutex_unlock(&tty_mutex);
 
-       if (retval)
+       if (IS_ERR(tty)) {
+               retval = PTR_ERR(tty);
                goto out;
+       }
 
        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
        filp->private_data = tty;