summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2010-12-12 00:23:32 -0800
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-01-06 15:18:45 +0000
commit0b524fb9314dc852d6a029296545ddbb17709a8b (patch)
tree7a71780cce6ed6d09082bc72203660206bdae346 /drivers/mtd/nand
parent7e95d1f1714cb993bc5b7e3a3d532b715b32d80a (diff)
downloadblackbird-op-linux-0b524fb9314dc852d6a029296545ddbb17709a8b.tar.gz
blackbird-op-linux-0b524fb9314dc852d6a029296545ddbb17709a8b.zip
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@gmail.com> Acked-by: Florian Fainelli <ffainelli@freebox.fr> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r--drivers/mtd/nand/nand_base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 9c8da741dce0..c52ded31a12e 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;
}
OpenPOWER on IntegriCloud