diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-09 19:55:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-09 19:55:02 +0200 |
| commit | a78ded13111dde555ed5de99cff10f41ae674cb1 (patch) | |
| tree | 0bd1a8edd5e6e5d73d945e1f9d938b82f7b0194d /drivers/mtd | |
| parent | f8736c2125f5bbbe7507e59c7b2c44ec17196aa3 (diff) | |
| parent | 6696ac19adb160b86aaccc38d1d6818606a44f97 (diff) | |
| download | talos-obmc-uboot-a78ded13111dde555ed5de99cff10f41ae674cb1.tar.gz talos-obmc-uboot-a78ded13111dde555ed5de99cff10f41ae674cb1.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/mtd')
| -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 ed1c9c9a88..7d178468ad 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); } |
