From 53fec9aefed109f9e7d43501d3ec51e9e60a0d1b Mon Sep 17 00:00:00 2001
From: Stanislav Fomichev <kernel@fomichev.me>
Date: Mon, 7 Feb 2011 23:48:25 +0300
Subject: [PATCH] --- yaml --- r: 242759 b: refs/heads/master c:
 7912a5e7f37512d8d105785046137435b70347ce h: refs/heads/master i:   242757:
 f46ee6fdd984046efcd1db0ba137a335910bd52d   242755:
 3514e0182e38e0709cc52096ab5e3ef1258f5623   242751:
 6eec132a80c3e7dcf5b61b2e0704bb450a4ffdd5 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/nand/nand_bbt.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 043d890c9f6e..2a81e3c88d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b7e905ec2ec511e06279181ca95a892db21e292
+refs/heads/master: 7912a5e7f37512d8d105785046137435b70347ce
diff --git a/trunk/drivers/mtd/nand/nand_bbt.c b/trunk/drivers/mtd/nand/nand_bbt.c
index 6ebd869993aa..a1e8b30078d9 100644
--- a/trunk/drivers/mtd/nand/nand_bbt.c
+++ b/trunk/drivers/mtd/nand/nand_bbt.c
@@ -1101,12 +1101,16 @@ static void mark_bbt_region(struct mtd_info *mtd, struct nand_bbt_descr *td)
 static void verify_bbt_descr(struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
 	struct nand_chip *this = mtd->priv;
-	u32 pattern_len = bd->len;
-	u32 bits = bd->options & NAND_BBT_NRBITS_MSK;
+	u32 pattern_len;
+	u32 bits;
 	u32 table_size;
 
 	if (!bd)
 		return;
+
+	pattern_len = bd->len;
+	bits = bd->options & NAND_BBT_NRBITS_MSK;
+
 	BUG_ON((this->options & NAND_USE_FLASH_BBT_NO_OOB) &&
 			!(this->options & NAND_USE_FLASH_BBT));
 	BUG_ON(!bits);