From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 1 Jun 2007 18:21:59 +0000 (+0100)
Subject: [MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions
X-Git-Tag: v2.6.22-rc4~1^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=718ea8361b15aec5f4cb559d63ba34bc5a58d8f9;p=linux-2.6-omap-h63xx.git

[MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions

It returns ERR_PTR(foo) on error, not just NULL.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index a279540ba87..aca33197120 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -106,9 +106,9 @@ static int get_sb_mtd_nr(struct file_system_type *fs_type, int flags,
 	struct mtd_info *mtd;
 
 	mtd = get_mtd_device(NULL, mtdnr);
-	if (!mtd) {
+	if (IS_ERR(mtd)) {
 		DEBUG(0, "MTDSB: Device #%u doesn't appear to exist\n", mtdnr);
-		return -EINVAL;
+		return PTR_ERR(mtd);
 	}
 
 	return get_sb_mtd_aux(fs_type, flags, dev_name, data, mtd, fill_super,
@@ -145,7 +145,7 @@ int get_sb_mtd(struct file_system_type *fs_type, int flags,
 
 			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 get_sb_mtd_aux(
 							fs_type, flags,