Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b524fb9 authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

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: default avatarBrian Norris <computersforpeace@gmail.com>
Acked-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 7e95d1f1

drivers/mtd/nand/nand_base.c

+1 −1
Original line number Diff line number Diff line
@@ -3157,7 +3157,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
	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;

}