summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-06-01 20:21:59 +0200
committerDavid Woodhouse <dwmw2@infradead.org>2007-06-01 20:21:59 +0200
commit718ea8361b15aec5f4cb559d63ba34bc5a58d8f9 (patch)
tree53abc2197122594996aefc19868ba3630975c613
parent[JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes() (diff)
downloadlinux-718ea8361b15aec5f4cb559d63ba34bc5a58d8f9.tar.xz
linux-718ea8361b15aec5f4cb559d63ba34bc5a58d8f9.zip
[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>
-rw-r--r--drivers/mtd/mtdsuper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index a279540ba87a..aca331971201 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,