From 402ad764d04986c9be2fb40040e96de61cddb157 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 15 Jan 2010 11:09:32 -0700
Subject: [PATCH] --- yaml --- r: 195860 b: refs/heads/master c:
 1449c5d0e8f25af6c903797a636696901122e4e8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/mtd/cfi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 055ede62270f..d11a936a47e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f2b1c86a1fa1414be93571062ac4c263fa9fbc
+refs/heads/master: 1449c5d0e8f25af6c903797a636696901122e4e8
diff --git a/trunk/include/linux/mtd/cfi.h b/trunk/include/linux/mtd/cfi.h
index df89f4275232..a4eefc5810dc 100644
--- a/trunk/include/linux/mtd/cfi.h
+++ b/trunk/include/linux/mtd/cfi.h
@@ -297,7 +297,7 @@ static inline uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs,
 	 * and 32bit devices on 16 bit busses
 	 * set the low bit of the alternating bit sequence of the address.
 	 */
-	if (((type * interleave) > bankwidth) && ((uint8_t)cmd_ofs == 0xaa))
+	if (((type * interleave) > bankwidth) && ((cmd_ofs & 0xff) == 0xaa))
 		addr |= (type >> 1)*interleave;
 
 	return  addr;