1 files changed, 4 insertions, 3 deletions

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index bc4b8106a490..590f60a897c1 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/fs.h>
+#include <linux/err.h>
 #include <linux/mount.h>
 #include <linux/jffs2.h>
 #include <linux/pagemap.h>
@@ -184,9 +185,9 @@ static int jffs2_get_sb_mtdnr(struct file_system_type *fs_type,
         struct mtd_info *mtd;
 
         mtd = get_mtd_device(NULL, mtdnr);
-        if (!mtd) {
+        if (IS_ERR(mtd)) {
                 D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr));
-                return -EINVAL;
+                return PTR_ERR(mtd);
         }
 
         return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
@@ -221,7 +222,7 @@ static int jffs2_get_sb(struct file_system_type *fs_type,
                         D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd:%%s, name \"%s\"\n", dev_name+4));
                         for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) {
                                 mtd = get_mtd_device(NULL, mtdnr);
-                                if (mtd) {
+                                if (!IS_ERR(mtd)) {
                                         if (!strcmp(mtd->name, dev_name+4))
                                                 return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt);
                                         put_mtd_device(mtd);