From: Thomas Kunze <thommycheck@gmx.de>
Date: Tue, 22 Apr 2008 23:40:52 +0000 (+0200)
Subject: [MTD] [NOR] Fix Intel CFI driver for collie flash
X-Git-Tag: v2.6.26-rc1~1069^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fe224668dff97dd8899bd559d1608cc9285db67b;p=linux-2.6-omap-h63xx.git

[MTD] [NOR] Fix Intel CFI driver for collie flash

collie seems to contain LH28F640BF flash chips. According to
http://sharp-world.com/products/device/flash/pdf/*FUM00701*@E.pdf
(page 83) if they have 0x51 of Extended Query Table (number of hardware
partitions) set to zero, they have a single fixed partition.
This patch makes those chips work.

Signed-off-by: Thomas Kunze <thommycheck@gmx.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index eb0e30824dd..e812df607a5 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -619,6 +619,9 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
 				  sizeof(struct cfi_intelext_blockinfo);
 		}
 
+		if (!numparts)
+			numparts = 1;
+
 		/* Programming Region info */
 		if (extp->MinorVersion >= '4') {
 			struct cfi_intelext_programming_regioninfo *prinfo;