Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index d17c20fd74e6958f171e41e6c74bcf27ab620b56..4733eab34a237faa58f57ea14bce96c9659cb2d7 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -495,7 +495,7 @@ void debugfs_remove(struct dentry *dentry)
        struct dentry *parent;
        int ret;
 
-       if (!dentry)
+       if (IS_ERR_OR_NULL(dentry))
                return;
 
        parent = dentry->d_parent;
@@ -527,7 +527,7 @@ void debugfs_remove_recursive(struct dentry *dentry)
        struct dentry *child;
        struct dentry *parent;
 
-       if (!dentry)
+       if (IS_ERR_OR_NULL(dentry))
                return;
 
        parent = dentry->d_parent;