From 5fd32328dbdcb32c3ea35ad7eff9e2e644b26f01 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 14 May 2010 01:35:54 +0100
Subject: [PATCH] --- yaml --- r: 195955 b: refs/heads/master c:
 412da2f6e083eba6e4bd91ff2e78abb4735357a7 h: refs/heads/master i:   195953:
 28acc88be9bff6f9aef28f392148c247d12cf04d   195951:
 b997e22d921eae9b73f5e5aa9b9fa1ed86cca8b1 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 476b09f28617..5b4a854985bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 564b84978df2bf83d334940f1a1190702579f79f
+refs/heads/master: 412da2f6e083eba6e4bd91ff2e78abb4735357a7
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
index ce38d3d049ef..c27dd1c936cd 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -390,14 +390,15 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 #endif
 
 			bootloc = extp->TopBottom;
-			if ((bootloc != 2) && (bootloc != 3)) {
-				printk(KERN_WARNING "%s: CFI does not contain boot "
-				       "bank location. Assuming top.\n", map->name);
+			if ((bootloc < 2) || (bootloc > 5)) {
+				printk(KERN_WARNING "%s: CFI contains unrecognised boot "
+				       "bank location (%d). Assuming bottom.\n",
+				       bootloc, map->name);
 				bootloc = 2;
 			}
 
 			if (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) {
-				printk(KERN_WARNING "%s: Swapping erase regions for broken CFI table.\n", map->name);
+				printk(KERN_WARNING "%s: Swapping erase regions for top-boot CFI table.\n", map->name);
 
 				for (i=0; i<cfi->cfiq->NumEraseRegions / 2; i++) {
 					int j = (cfi->cfiq->NumEraseRegions-1)-i;