3 files changed, 5 insertions, 2 deletions

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 1dcafb8f47d..586b981f0e6 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -999,7 +999,8 @@ static int check_create(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_desc
                         continue;
 
                 /* Create the table in memory by scanning the chip(s) */
-                create_bbt(mtd, buf, bd, chipsel);
+                if (!(this->options & NAND_CREATE_EMPTY_BBT))
+                        create_bbt(mtd, buf, bd, chipsel);
 
                 td->version[i] = 1;
                 if (md)
diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index ba15b525987..57cc0e63714 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -84,7 +84,7 @@ struct nand_bbt_descr {
 #define NAND_BBT_PERCHIP        0x00000080
 /* bbt has a version counter at offset veroffs */
 #define NAND_BBT_VERSION        0x00000100
-/* Create a bbt if none axists */
+/* Create a bbt if none exists */
 #define NAND_BBT_CREATE         0x00000200
 /* Search good / bad pattern through all pages of a block */
 #define NAND_BBT_SCANALLPAGES   0x00000400
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index c0464d41f53..023866572fb 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -223,6 +223,8 @@ typedef enum {
  * the OOB area.
  */
 #define NAND_USE_FLASH_BBT_NO_OOB       0x00100000
+/* Create an empty BBT with no vendor information if the BBT is available */
+#define NAND_CREATE_EMPTY_BBT           0x00200000
 
 /* Options set by nand scan */
 /* Nand scan has allocated controller struct */