aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-12-03 16:36:34 +0000
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-12-03 16:36:54 +0000
commit4ccb3b4497ce01fab4933704fe21581e30fda1a5 (patch)
treeb1fae258faf3c54bf0d967fd4389a00460ede523 /drivers
parent01039e4e63a8ea0d66fcfc71d7b99769bbbed9d6 (diff)
downloadkernel_samsung_crespo-4ccb3b4497ce01fab4933704fe21581e30fda1a5.zip
kernel_samsung_crespo-4ccb3b4497ce01fab4933704fe21581e30fda1a5.tar.gz
kernel_samsung_crespo-4ccb3b4497ce01fab4933704fe21581e30fda1a5.tar.bz2
mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/nand_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 75d199e..33550c4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2894,7 +2894,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
mtd->writesize = le32_to_cpu(p->byte_per_page);
mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize;
mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
- chip->chipsize = le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
+ chip->chipsize = (uint64_t)le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
busw = 0;
if (le16_to_cpu(p->features) & 1)
busw = NAND_BUSWIDTH_16;