aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/nand_base.c
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@code-monkey.de>2010-08-20 14:01:47 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-08-20 22:26:20 +0100
commitcfe3fdadb16162327773ef01a575a32000b8c7f4 (patch)
treee93dd6e4a80c1cdb23f9a2b562d4cb2bfb955f37 /drivers/mtd/nand/nand_base.c
parent065a1ed8de85583888b3d4f22c64b534a1fbdaaa (diff)
downloadmrst-s0i3-test-cfe3fdadb16162327773ef01a575a32000b8c7f4.tar.gz
mrst-s0i3-test-cfe3fdadb16162327773ef01a575a32000b8c7f4.tar.xz
mrst-s0i3-test-cfe3fdadb16162327773ef01a575a32000b8c7f4.zip
mtd: nand: Fix probe of Samsung NAND chips
Apparently, the check for a 6-byte ID string introduced by commit 426c457a3216fac74e3d44dd39729b0689f4c7ab ("mtd: nand: extend NAND flash detection to new MLC chips") is NOT sufficient to determine whether or not a Samsung chip uses their new MLC detection scheme or the old, standard scheme. This adds a condition to check cell type. Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de> Signed-off-by: Brian Norris <norris@broadcom.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Cc: stable@kernel.org
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
-rw-r--r--drivers/mtd/nand/nand_base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index a22ed7b281c..d551ddd9537 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2866,6 +2866,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
*/
if (id_data[0] == id_data[6] && id_data[1] == id_data[7] &&
id_data[0] == NAND_MFR_SAMSUNG &&
+ (chip->cellinfo & NAND_CI_CELLTYPE_MSK) &&
id_data[5] != 0x00) {
/* Calc pagesize */
mtd->writesize = 2048 << (extid & 0x03);