Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 16f8edfe5cdc..4430a1f8fdf1 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -601,8 +601,8 @@ static int __init debugfs_mips(void)
         struct dentry *d;
 
         d = debugfs_create_dir("mips", NULL);
-        if (IS_ERR(d))
-                return PTR_ERR(d);
+        if (!d)
+                return -ENOMEM;
         mips_debugfs_dir = d;
         return 0;
 }