From: Sandeep Paulraj <s-paulraj@ti.com>
Date: Sat, 7 Nov 2009 19:24:06 +0000 (-0500)
Subject: NAND: Correct the "chip_shift" calculation
X-Git-Tag: v2010.03-rc1~200^2~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f41e7ea1a17ba7207ca41379bf344b317e72c12;p=u-boot

NAND: Correct the "chip_shift" calculation

This patch updates the "chip_shift" calculation in the
NAND driver. This is being done to sync up the NAND driver with
the kernel NAND driver.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
---

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 30a3e9e742..d5c53fed1b 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2628,7 +2628,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
 	chip->bbt_erase_shift = chip->phys_erase_shift =
 		ffs(mtd->erasesize) - 1;
 	if (chip->chipsize & 0xffffffff)
-		chip->chip_shift = ffs(chip->chipsize) - 1;
+		chip->chip_shift = ffs((unsigned)chip->chipsize) - 1;
 	else
 		chip->chip_shift = ffs((unsigned)(chip->chipsize >> 32)) + 31;