- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / mtd / chips / gen_probe.c

diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index e2dc964..3b9a284 100644 (file)
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -155,8 +155,7 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
                        pchip->start = (i << cfi.chipshift);
                        pchip->state = FL_READY;
                        init_waitqueue_head(&pchip->wq);
-                       spin_lock_init(&pchip->_spinlock);
-                       pchip->mutex = &pchip->_spinlock;
+                       mutex_init(&pchip->mutex);
                }
        }
 
@@ -242,17 +241,19 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
                /* We need these for the !CONFIG_MODULES case,
                   because symbol_get() doesn't work there */
 #ifdef CONFIG_MTD_CFI_INTELEXT
-       case 0x0001:
-       case 0x0003:
-       case 0x0200:
+       case P_ID_INTEL_EXT:
+       case P_ID_INTEL_STD:
+       case P_ID_INTEL_PERFORMANCE:
                return cfi_cmdset_0001(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_AMDSTD
-       case 0x0002:
+       case P_ID_AMD_STD:
+       case P_ID_SST_OLD:
+       case P_ID_WINBOND:
                return cfi_cmdset_0002(map, primary);
 #endif
 #ifdef CONFIG_MTD_CFI_STAA
-        case 0x0020:
+        case P_ID_ST_ADV:
                return cfi_cmdset_0020(map, primary);
 #endif
        default: