aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/erase.c
diff options
context:
space:
mode:
authorArtem B. Bityuckiy <dedekind@infradead.org>2005-05-03 11:19:02 -0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-23 07:19:07 -0400
commit8cd79216676d9122fa714615e6b49553761aca8a (patch)
tree148c1c6abe0e9241a0a701d05518386128424a97 /fs/jffs2/erase.c
parentc25bb1f59ca6ebbee2649d82533537d4bf123609 (diff)
[JFFS2] Fix NOR only compile
Fix the bug that caouses problems when compiling for NOR. We read a newly erased block so we don't need to check ECC. Define jffs2_is_writebuffered as zero if there is no wbuf. Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/erase.c')
-rw-r--r--fs/jffs2/erase.c7
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);