Message ID | 4D1C4338.2030003@rw-gmbh.de |
---|---|
State | New, archived |
Headers | show |
Hello, On Thursday 30 December 2010 09:30:48 Ralf Rösch wrote: > Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de> > --- > 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 1f75a1b..f29183a 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; > } The same fix has already been submitted and applied a couple of days ago: http://patchwork.ozlabs.org/patch/75222/ -- Florian
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 1f75a1b..f29183a 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; } -- 1.7.2.3
Signed-off-by: Ralf Roesch <ralf.roesch@rw-gmbh.de> --- drivers/mtd/nand/nand_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)