pastebin

Paste #87237: Untitled ASCII paste by 88.188.83.94

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 1ef937b..65ac8af 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -33,6 +33,7 @@
 
 				nand-ecc-mode = "hw";
 				nand-rnd-mode = "hw";
+				/*
 				nand-on-flash-bbt;
 
 				boot0@0 {
@@ -74,6 +75,7 @@
 						0x2d2e 0x1aea 0x2e17 0x173d 0x3a6e 0x71bf 0x25f9 0x0a5d
 						0x7c57 0x0fbe 0x46ce 0x4939 0x6b17 0x37bb 0x3e91 0x76db>;
 				};
+				*/
 			};
 		};
 
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 7311063..153b323 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3312,8 +3312,10 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
 					chip->page_shift, 0, allowbbt)) {
 			pr_warn("%s: attempt to erase a bad block at page 0x%08x\n",
 				    __func__, page);
+			/*
 			instr->state = MTD_ERASE_FAILED;
 			goto erase_exit;
+			*/
 		}
 
 		/*

Private
Wrap long lines

2 + 1 =