diff options
| author | Steve Sakoman <steve@sakoman.com> | 2010-08-19 20:14:01 -0700 |
|---|---|---|
| committer | Sandeep Paulraj <s-paulraj@ti.com> | 2010-09-08 14:51:29 -0400 |
| commit | 4c468397cf71f2ab613c9c8989ab56d4b306a67f (patch) | |
| tree | 48d4e944a983e600a297b9bf6d0711f41b282211 | |
| parent | 3667cbeed5e3c4067e624e52a916b1ebb02c8f05 (diff) | |
| download | u-boot-imx-4c468397cf71f2ab613c9c8989ab56d4b306a67f.zip u-boot-imx-4c468397cf71f2ab613c9c8989ab56d4b306a67f.tar.gz u-boot-imx-4c468397cf71f2ab613c9c8989ab56d4b306a67f.tar.bz2 | |
mtd: nand: supress 'unknown NAND' warning if no nand is found
This printk was added recently and results in ugly output on systems
with no NAND:
NAND: nand_get_flash_type: unknown NAND device: Manufacturer ID: 0x00, Chip ID: 0x00 0 MiB
instead of:
NAND: 0 MiB
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ed1c9c9..7d17846 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2653,9 +2653,12 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, } if (!type) { - printk(KERN_INFO "%s: unknown NAND device: Manufacturer ID:" - " 0x%02x, Chip ID: 0x%02x\n", __func__, - *maf_id, dev_id); + /* supress warning if there is no nand */ + if (*maf_id != 0x00 && *maf_id != 0xff && + dev_id != 0x00 && dev_id != 0xff) + printk(KERN_INFO "%s: unknown NAND device: " + "Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", + __func__, *maf_id, dev_id); return ERR_PTR(-ENODEV); } |