mtd: nand: choose correct chip name (ONFI bug)
authorBrian Norris <computersforpeace@gmail.com>
Sun, 12 Dec 2010 08:23:32 +0000 (00:23 -0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 6 Jan 2011 15:18:45 +0000 (15:18 +0000)
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@gmail.com>
Acked-by: Florian Fainelli <ffainelli@freebox.fr>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/nand/nand_base.c

index 9c8da741dce05539a8352cedd752c9120677659b..c52ded31a12e75cd9e2f37006aa663348802b0ed 100644 (file)
@@ -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;
 }