diff options
Diffstat (limited to 'fs/jffs2/erase.c')
-rw-r--r-- | fs/jffs2/erase.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index bb47673c1e59..088faadf8f38 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: erase.c,v 1.75 2005/04/05 12:51:54 dedekind Exp $ | 10 | * $Id: erase.c,v 1.76 2005/05/03 15:11:40 dedekind Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -332,10 +332,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb | |||
332 | 332 | ||
333 | bad_offset = ofs; | 333 | bad_offset = ofs; |
334 | 334 | ||
335 | if (!jffs2_is_writebuffered(c) || !jffs2_cleanmarker_oob(c)) | 335 | ret = c->mtd->read(c->mtd, ofs, readlen, &retlen, ebuf); |
336 | ret = c->mtd->read(c->mtd, ofs, readlen, &retlen, ebuf); | ||
337 | else | ||
338 | ret = c->mtd->read_ecc(c->mtd, ofs, readlen, &retlen, ebuf, NULL, c->oobinfo); | ||
339 | 336 | ||
340 | if (ret) { | 337 | if (ret) { |
341 | printk(KERN_WARNING "Read of newly-erased block at 0x%08x failed: %d. Putting on bad_list\n", ofs, ret); | 338 | printk(KERN_WARNING "Read of newly-erased block at 0x%08x failed: %d. Putting on bad_list\n", ofs, ret); |