diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-06-01 14:21:59 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-06-01 14:21:59 -0400 |
commit | 718ea8361b15aec5f4cb559d63ba34bc5a58d8f9 (patch) | |
tree | 53abc2197122594996aefc19868ba3630975c613 /drivers | |
parent | ea55d30798ac206c9f584ac264b6b8eb093d237a (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/mtdsuper.c | 6 |
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, | |||
106 | struct mtd_info *mtd; | 106 | struct mtd_info *mtd; |
107 | 107 | ||
108 | mtd = get_mtd_device(NULL, mtdnr); | 108 | mtd = get_mtd_device(NULL, mtdnr); |
109 | if (!mtd) { | 109 | if (IS_ERR(mtd)) { |
110 | DEBUG(0, "MTDSB: Device #%u doesn't appear to exist\n", mtdnr); | 110 | DEBUG(0, "MTDSB: Device #%u doesn't appear to exist\n", mtdnr); |
111 | return -EINVAL; | 111 | return PTR_ERR(mtd); |
112 | } | 112 | } |
113 | 113 | ||
114 | return get_sb_mtd_aux(fs_type, flags, dev_name, data, mtd, fill_super, | 114 | 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, | |||
145 | 145 | ||
146 | for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) { | 146 | for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) { |
147 | mtd = get_mtd_device(NULL, mtdnr); | 147 | mtd = get_mtd_device(NULL, mtdnr); |
148 | if (mtd) { | 148 | if (!IS_ERR(mtd)) { |
149 | if (!strcmp(mtd->name, dev_name + 4)) | 149 | if (!strcmp(mtd->name, dev_name + 4)) |
150 | return get_sb_mtd_aux( | 150 | return get_sb_mtd_aux( |
151 | fs_type, flags, | 151 | fs_type, flags, |