From 623860282d54f8f52243033217d5b70a3c4cb119 Mon Sep 17 00:00:00 2001 From: Gernot Hoyler Date: Mon, 11 Apr 2011 15:53:35 +0200 Subject: [PATCH] --- yaml --- r: 252477 b: refs/heads/master c: c9ddab25d1b62baead4b0c5de562f1fce026dcfd h: refs/heads/master i: 252475: 1e11b0ac8de3b04254eaf480f0493bee5444cce1 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index de3a65b64a5a..fb86286044dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99b17c08bca2810f5910b3027f1b9d82edf7a576 +refs/heads/master: c9ddab25d1b62baead4b0c5de562f1fce026dcfd diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c index 0b49266840b9..b890f6c964d9 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c @@ -462,13 +462,14 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) cfi_fixup_major_minor(cfi, extp); /* - * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 + * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4, 1.5 * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 * http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf * http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf + * http://www.spansion.com/Support/Datasheets/S29GL_128S_01GS_00_02_e.pdf */ if (extp->MajorVersion != '1' || - (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) { + (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '5'))) { printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " "version %c.%c (%#02x/%#02x).\n", extp->MajorVersion, extp->MinorVersion,