X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=a8dae40bd37804c4d396e189b229969723868c92;hp=9afd5ec8e1c6cdf2233fc81264a69cf79cae4d28;hb=refs%2Fheads%2Fblock-refreshing;hpb=87b33ecd1898c99b9aa2b0abcbb3e6002d6b3532

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 9afd5ec..a8dae40 100644
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -42,7 +42,7 @@ int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
 		bi = yaffs_get_block_info(dev,
 					  nand_chunk /
 					  dev->param.chunks_per_block);
-		yaffs_handle_chunk_error(dev, bi);
+		yaffs_handle_chunk_error(dev, bi, tags->ecc_result);
 	}
 	return result;
 }
@@ -80,6 +80,10 @@ int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
 {
 	block_no -= dev->block_offset;
 	dev->n_bad_markings++;
+
+	if (dev->param.disable_bad_block_marking)
+		return YAFFS_OK;
+
 	return dev->tagger.mark_bad_fn(dev, block_no);
 }