mtd: cfi_cmdset_0002: fix the check for valid primary extension versions
PATCH 1/1 mtd: cfi_cmdset_0002: fix the check for valid primary extension versions
Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 [1][2][3]. Fix the check in cfi_cmdset_0002 accordingly.
[1] http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19
[2] http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
[3] http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
--- drivers/mtd/chips/cfi_cmdset_0002.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +13 -3
@@ -417,16 +417,26 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)*/ cfi_fixup_major_minor (cfi, extp); +/* +* Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 +* see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 +* http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf +* http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf +*/ if (extp->MajorVersion !='1' || - (extp->MinorVersion <'0' || extp->MinorVersion >'4' )) { + (extp->MajorVersion =='1' && ( extp->MinorVersion <'0' || extp->MinorVersion >'4' ))) {printk (KERN_ERR " Unknown Amd/Fujitsu Extended Query " -"version %c.%c.\n" , extp->MajorVersion, - extp->MinorVersion); +"version %c.%c (%#02x/%#02x).\n" , + extp->MajorVersion, extp->MinorVersion, + extp->MajorVersion, extp->MinorVersion);kfree (extp);kfree (mtd);return NULL ; } +printk (KERN_INFO " Amd/Fujitsu Extended Query version %c.%c.\n" , + extp->MajorVersion, extp->MinorVersion); +/* Install our own private info structure */ cfi->cmdset_priv = extp;
Quoted 9 lines · Guillaume LECERF
Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4 [1][2][3]. Fix the check in
cfi_cmdset_0002accordingly.[1] http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19
[2] http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf
[3] http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdfSigned-off-by Florian Fainelli <[email protected]>Signed-off-by Guillaume LECERF <[email protected]>
Please, make it applicable to mtd-2.6.git / master tree and re-send.
Signature · 2 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий)