| Message ID | 1292142213-645-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0b524fb9314dc852d6a029296545ddbb17709a8b |
| Headers | show |
On Sunday 12 December 2010 09:23:32 Brian Norris wrote: > 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> > --- > 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 33550c4..38b5eb0 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -3164,7 +3164,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; > }
On Sun, 2010-12-12 at 00:23 -0800, Brian Norris wrote: > 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> Pushed both to l2-mtd-2.6.git, thanks!
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 33550c4..38b5eb0 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3164,7 +3164,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; }
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> --- drivers/mtd/nand/nand_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)