Patchwork mtd/nand: move pointer dereferencing after the actual check in verify_bbt_descr

login
register
mail settings
Submitter Stanislav Fomichev
Date Feb. 7, 2011, 8:48 p.m.
Message ID <4d505a9f.918acc0a.1584.ffffbfd6@mx.google.com>
Download mbox | patch
Permalink /patch/82137/
State Accepted
Commit 7912a5e7f37512d8d105785046137435b70347ce
Headers show

Comments

Stanislav Fomichev - Feb. 7, 2011, 8:48 p.m.
Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
---
 drivers/mtd/nand/nand_bbt.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
Artem Bityutskiy - Feb. 11, 2011, 2:15 p.m.
On Mon, 2011-02-07 at 23:48 +0300, Stanislav Fomichev wrote:
> Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
> ---
>  drivers/mtd/nand/nand_bbt.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c

Thanks, although the descriptions had a small issue - you put everything
to the subject and made it too long. I amended it a little and pushed to
l2-mtd-2.6.git tree, thanks.

Patch

diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 6ebd869..a1e8b30 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/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);