From 7ad2daae557fd7bfcd246715c9a391133560ae41 Mon Sep 17 00:00:00 2001 From: Guillaume LECERF Date: Fri, 17 Dec 2010 10:59:47 +0100 Subject: [PATCH] --- yaml --- r: 231709 b: refs/heads/master c: e8953b7395089b917f30d0909f845664d5fafa4e h: refs/heads/master i: 231707: a13c5591c5401194c9492a2c4c139496acc4f1ba v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2f05415280c..ef35353b56f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e637276370cb11068ab185c342eac5a78e5415b4 +refs/heads/master: e8953b7395089b917f30d0909f845664d5fafa4e diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c index 324fee4024a9..a43ab45bdb18 100644 --- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c @@ -393,10 +393,12 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi, struct cfi_pri_amdstd *extp) { if (cfi->mfr == CFI_MFR_SAMSUNG) { - if (extp->MajorVersion == '0' && extp->MinorVersion == '0') { + if ((extp->MajorVersion == '0' && extp->MinorVersion == '0') || + (extp->MajorVersion == '3' && extp->MinorVersion == '3')) { /* * Samsung K8P2815UQB and K8D6x16UxM chips * report major=0 / minor=0. + * K8D3x16UxC chips report major=3 / minor=3. */ printk(KERN_NOTICE " Fixing Samsung's Amd/Fujitsu" " Extended Query version to 1.%c\n",