summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShmulik Ladkani <shmulik.ladkani@gmail.com>2012-06-10 13:58:12 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:38:58 +0900
commit196f9c71e5f46965325f31532f1d55c4a809f6ff (patch)
tree4398f2d68b281c8404fab6046e2887a4b8bdb885
parent70b22c795bbe61ab4935649bb6b4135f29d164bd (diff)
downloadlinux-3.10-196f9c71e5f46965325f31532f1d55c4a809f6ff.tar.gz
linux-3.10-196f9c71e5f46965325f31532f1d55c4a809f6ff.tar.bz2
linux-3.10-196f9c71e5f46965325f31532f1d55c4a809f6ff.zip
mtd: nand: Use the mirror BBT descriptor when reading its version
commit 7bb9c75436212813b38700c34df4bbb6eb82debe upstream. The code responsible for reading the version of the mirror bbt was incorrectly using the descriptor of the main bbt. Pass the mirror bbt descriptor to 'scan_read_raw' when reading the version of the mirror bbt. Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mtd/nand/nand_bbt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 30d1319ff06..c126469b064 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -390,7 +390,7 @@ static int read_abs_bbts(struct mtd_info *mtd, uint8_t *buf,
/* Read the mirror version, if available */
if (md && (md->options & NAND_BBT_VERSION)) {
scan_read_raw(mtd, buf, (loff_t)md->pages[0] << this->page_shift,
- mtd->writesize, td);
+ mtd->writesize, md);
md->version[0] = buf[bbt_get_ver_offs(mtd, md)];
pr_info("Bad block table at page %d, version 0x%02X\n",
md->pages[0], md->version[0]);