Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / tty / pty.c

diff --git a/drivers/char/pty.c b/drivers/tty/pty.c
similarity index 99%
rename from drivers/char/pty.c
rename to drivers/tty/pty.c
index c350d01716bdace6ef510809e964a57c7129134b..923a48585501494f8b0bcae77aa562a1104bd7dd 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/tty/pty.c
@@ -676,7 +676,9 @@ static int ptmx_open(struct inode *inode, struct file *filp)
 
        set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
 
-       tty_add_file(tty, filp);
+       retval = tty_add_file(tty, filp);
+       if (retval)
+               goto out;
 
        retval = devpts_pty_new(inode, tty->link);
        if (retval)