diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-04-03 18:23:52 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-04-15 15:53:11 -0500 |
| commit | a931f49296fa2406abf3c21ea97697513571b7fb (patch) | |
| tree | b609be273a371995dc956a9c3c5f0b02658b61e3 /drivers/mtd | |
| parent | 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba (diff) | |
| download | blackbird-obmc-uboot-a931f49296fa2406abf3c21ea97697513571b7fb.tar.gz blackbird-obmc-uboot-a931f49296fa2406abf3c21ea97697513571b7fb.zip | |
NAND: Fix integer overflow in ONFI detection of chips >= 4GiB
This patch sync with David's patch on Linux in nand_flash_detect_onfi()
commit 4ccb3b4497ce01fab4933704fe21581e30fda1a5
Author: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri Dec 3 16:36:34 2010 +0000
mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index fa286a8d81..3cb92c19c2 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2482,7 +2482,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, 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; |
