Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[linux-2.6-block.git] / drivers / char / pty.c

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index d86c0bc05c1c7839b4db8873daf96a21fd32cfe8..385c44b3034f4000df9d8a4ad917f3e030c4a143 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -659,7 +659,7 @@ static int __ptmx_open(struct inode *inode, struct file *filp)
        if (!retval)
                return 0;
 out1:
-       tty_release_dev(filp);
+       tty_release(inode, filp);
        return retval;
 out:
        devpts_kill_index(inode, index);