From 599dd690153466772f07c51d4e4c6b8cc3cd257c Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Fri, 20 Aug 2010 14:01:47 -0700
Subject: [PATCH] --- yaml --- r: 209701 b: refs/heads/master c:
 cfe3fdadb16162327773ef01a575a32000b8c7f4 h: refs/heads/master i:   209699:
 f30e6f999f798397548af7bafbd5615ba6778f0b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/nand_base.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6ef915c657a3..2e0091bac2d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 065a1ed8de85583888b3d4f22c64b534a1fbdaaa
+refs/heads/master: cfe3fdadb16162327773ef01a575a32000b8c7f4
diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c
index a22ed7b281ce..d551ddd9537a 100644
--- a/trunk/drivers/mtd/nand/nand_base.c
+++ b/trunk/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);