mtd: nand: choose correct chip name (ONFI bug)

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=0b524fb9314dc852d6a029296545ddbb17709a8b
Commit:     0b524fb9314dc852d6a029296545ddbb17709a8b
Parent:     7e95d1f1714cb993bc5b7e3a3d532b715b32d80a
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Sun Dec 12 00:23:32 2010 -0800
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Thu Jan 6 15:18:45 2011 +0000

    mtd: nand: choose correct chip name (ONFI bug)
    
    We have the order of the conditional wrong for choosing the ONFI chip name
    vs. the ID table name. Without this fix, we will almost *always* choose a
    NULL string to print out instead of the correct one.
    
    This has already been suggested by Matthieu Castet.
    
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
    Acked-by: Florian Fainelli <ffainelli at freebox.fr>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/nand_base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 9c8da74..c52ded3 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3157,7 +3157,7 @@ ident_done:
 	printk(KERN_INFO "NAND device: Manufacturer ID:"
 		" 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, *dev_id,
 		nand_manuf_ids[maf_idx].name,
-	chip->onfi_version ? type->name : chip->onfi_params.model);
+		chip->onfi_version ? chip->onfi_params.model : type->name);
 
 	return type;
 }