diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:32:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:32:37 +0200 |
| commit | bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858 (patch) | |
| tree | 13fdb2d07e850768429dc87c00a0943d7e18ff18 /drivers/mtd/nand | |
| parent | 8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a (diff) | |
| parent | 7af9c3a84384b4330ba961ea5bf3a7a79d8ad1f1 (diff) | |
| download | barebox-bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858.tar.gz barebox-bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index b0548a3e96..1357c5cc6f 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -551,7 +551,7 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr { struct nand_chip *this = mtd->priv; int i, chips; - int bits, startblock, block, dir; + int startblock, block, dir; int scanlen = mtd->writesize + mtd->oobsize; int bbtblocks; int blocktopage = this->bbt_erase_shift - this->page_shift; @@ -575,9 +575,6 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr bbtblocks = mtd->size >> this->bbt_erase_shift; } - /* Number of bits for each erase block in the bbt */ - bits = td->options & NAND_BBT_NRBITS_MSK; - for (i = 0; i < chips; i++) { /* Reset version information */ td->version[i] = 0; |