1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -374,9 +374,32 @@ static void cfi_fixup_major_minor(struct
5 // manufacturers defined in include/linux/mtd/cfi.h
7 - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
8 - extp->MajorVersion == '0')
9 + if (cfi->mfr == CFI_MFR_SAMSUNG &&
10 + extp->MajorVersion == '0') {
11 + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
12 + extp->MajorVersion, extp->MinorVersion);
14 extp->MajorVersion = '1';
15 + extp->MinorVersion = '0';
17 + printk(" to %c.%c.\n",
18 + extp->MajorVersion, extp->MinorVersion);
21 + if (cfi->mfr == CFI_MFR_SAMSUNG &&
22 + extp->MajorVersion == '3' && extp->MinorVersion == '3') {
23 + printk(KERN_NOTICE " Newer Samsung flash detected, "
24 + "should be compatibile with Amd/Fujitsu.\n");
26 + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
27 + extp->MajorVersion, extp->MinorVersion);
29 + extp->MajorVersion = '1'; // set to 1.3 (last defined version)
30 + extp->MinorVersion = '3';
32 + printk(" to %c.%c.\n",
33 + extp->MajorVersion, extp->MinorVersion);
37 struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)