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 <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
Signed-off-by: David Woodhouse <[email protected]>
This commit is contained in:
Brian Norris 2010-12-12 00:23:32 -08:00 • committed by David Woodhouse
commit 0b524fb931

View 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;
}