X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=fe1219095c520ed21acdf6d9be95196333137f94;hp=9afd5ec8e1c6cdf2233fc81264a69cf79cae4d28;hb=HEAD;hpb=a78bce6f4a7042fa153ab32d2bb263ecf7d27b66

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 9afd5ec..fe12190 100644
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -80,6 +79,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);
 }