X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fjffs2%2Fscan.c;h=96ef21eff62b85ccdd1c5f37478a8a9802d2e031;hb=e8f50fb7b31893a7ee3ff49dcadcb064f499f8fd;hp=7654e87b042869ef43aff269a10e88a4088d59c3;hpb=5ff5c3a4ab0d638fa63e939e75727c233b681e8d;p=karo-tx-linux.git diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 7654e87b0428..96ef21eff62b 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -113,7 +113,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) if (!flashbuf) { /* For NAND it's quicker to read a whole eraseblock at a time, apparently */ - if (jffs2_cleanmarker_oob(c)) + if (c->mtd->type == MTD_NANDFLASH) try_size = c->sector_size; else try_size = PAGE_SIZE; @@ -459,7 +459,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo jffs2_dbg(1, "%s(): Scanning block at 0x%x\n", __func__, ofs); #ifdef CONFIG_JFFS2_FS_WRITEBUFFER - if (jffs2_cleanmarker_oob(c)) { + if (c->mtd->type == MTD_NANDFLASH) { int ret; if (mtd_block_isbad(c->mtd, jeb->offset))