mtd/drivers/mtd/nand nand_bbt.c,1.27,1.28

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv14756

Modified Files:
	nand_bbt.c 
Log Message:
Do not enforce flahsbased bad block tables. Stupid me

Index: nand_bbt.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_bbt.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nand_bbt.c	12 Nov 2004 10:40:36 -0000	1.27
+++ nand_bbt.c	13 Nov 2004 10:19:09 -0000	1.28
@@ -1001,10 +1001,6 @@
 		return nand_scan_bbt (mtd, &agand_flashbased);
 	}
 	
-	if (!this->badblock_pattern) {
-		this->badblock_pattern = (mtd->oobblock > 512) ?
-			&largepage_flashbased : &smallpage_flashbased;
-	}
 	
 	/* Is a flash based bad block table requested ? */
 	if (this->options & NAND_USE_FLASH_BBT) {
@@ -1013,9 +1009,17 @@
 			this->bbt_td = &bbt_main_descr;
 			this->bbt_md = &bbt_mirror_descr;
 		}
+		if (!this->badblock_pattern) {
+			this->badblock_pattern = (mtd->oobblock > 512) ?
+				&largepage_flashbased : &smallpage_flashbased;
+		}
 	} else {
 		this->bbt_td = NULL;
 		this->bbt_md = NULL;
+		if (!this->badblock_pattern) {
+			this->badblock_pattern = (mtd->oobblock > 512) ?
+				&largepage_memorybased : &smallpage_memorybased;
+		}
 	}
 	return nand_scan_bbt (mtd, this->badblock_pattern);
 }