mtd: quiet sparse noise in cfi.h

[deliverable/linux.git] / include / linux / mtd / cfi.h

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 88d3d8fbf9f2d502855af56d8d800a52f7b1e129..a4eefc5810dc75177aea0298f9e82730819b1d4a 100644 (file)
--- a/include/linux/mtd/cfi.h
+++ b/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;
@@ -518,10 +518,11 @@ struct cfi_fixup {
 #define CFI_MFR_ANY 0xffff
 #define CFI_ID_ANY  0xffff
 
-#define CFI_MFR_AMD 0x0001
-#define CFI_MFR_ATMEL 0x001F
-#define CFI_MFR_SAMSUNG 0x00EC
-#define CFI_MFR_ST  0x0020     /* STMicroelectronics */
+#define CFI_MFR_AMD    0x0001
+#define CFI_MFR_INTEL  0x0089
+#define CFI_MFR_ATMEL  0x001F
+#define CFI_MFR_SAMSUNG        0x00EC
+#define CFI_MFR_ST     0x0020 /* STMicroelectronics */
 
 void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);