From 6b48abcb3c7394dfe4dfdc236285539aa1cfcf0c Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 30 Jan 2012 15:08:26 +0200 Subject: [PATCH] --- yaml --- r: 298092 b: refs/heads/master c: f02654504dd24348ed28bc965527de99abaa4485 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jffs2/scan.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index fe4c1238aced..505dcdea466d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 570469f3bde7f71cc1ece07a18d54a05b6a8775d +refs/heads/master: f02654504dd24348ed28bc965527de99abaa4485 diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c index f99464833bb2..c02737375854 100644 --- a/trunk/fs/jffs2/scan.c +++ b/trunk/fs/jffs2/scan.c @@ -96,18 +96,16 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) #ifndef __ECOS size_t pointlen, try_size; - if (c->mtd->point) { - ret = mtd_point(c->mtd, 0, c->mtd->size, &pointlen, - (void **)&flashbuf, NULL); - if (!ret && pointlen < c->mtd->size) { - /* Don't muck about if it won't let us point to the whole flash */ - D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", pointlen)); - mtd_unpoint(c->mtd, 0, pointlen); - flashbuf = NULL; - } - if (ret && ret != -EOPNOTSUPP) - D1(printk(KERN_DEBUG "MTD point failed %d\n", ret)); + ret = mtd_point(c->mtd, 0, c->mtd->size, &pointlen, + (void **)&flashbuf, NULL); + if (!ret && pointlen < c->mtd->size) { + /* Don't muck about if it won't let us point to the whole flash */ + D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", pointlen)); + mtd_unpoint(c->mtd, 0, pointlen); + flashbuf = NULL; } + if (ret && ret != -EOPNOTSUPP) + D1(printk(KERN_DEBUG "MTD point failed %d\n", ret)); #endif if (!flashbuf) { /* For NAND it's quicker to read a whole eraseblock at a time,