Merge branch 'next' into for-linus

[linux.git] / fs / devpts / inode.c

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index c6bd815dc7943c1035e82cd6010b83ba2b00b584..2f27e578d4660e89c1215d7a9edc2dffa6439c89 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -502,7 +502,7 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
        mutex_lock(&root->d_inode->i_mutex);
 
        dentry = d_alloc_name(root, s);
-       if (!IS_ERR(dentry)) {
+       if (dentry) {
                d_add(dentry, inode);
                fsnotify_create(root->d_inode, dentry);
        } else {