diff options
| author | Stefan Roese <sr@denx.de> | 2006-12-28 19:09:07 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-12-28 19:09:07 +0100 |
| commit | cce2adfb93ea31d21a2f69bbf68146dfe8c40350 (patch) | |
| tree | 1485bc01fbdd9b6b8b8493c490ba4bf6f5cb4439 /drivers/nand/nand.c | |
| parent | 074acedbff821026ed47035e56a18600d789ce05 (diff) | |
| parent | 92eb729bad876725aeea908d2addba0800620840 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'drivers/nand/nand.c')
| -rw-r--r-- | drivers/nand/nand.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c index 3899045a72c..9fef71d6293 100644 --- a/drivers/nand/nand.c +++ b/drivers/nand/nand.c @@ -39,7 +39,7 @@ static ulong base_address[CFG_MAX_NAND_DEVICE] = CFG_NAND_BASE_LIST; static const char default_nand_name[] = "nand"; -extern void board_nand_init(struct nand_chip *nand); +extern int board_nand_init(struct nand_chip *nand); static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, ulong base_addr) @@ -47,13 +47,16 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, mtd->priv = nand; nand->IO_ADDR_R = nand->IO_ADDR_W = (void __iomem *)base_addr; - board_nand_init(nand); - - if (nand_scan(mtd, 1) == 0) { - if (!mtd->name) - mtd->name = (char *)default_nand_name; - } else + if (board_nand_init(nand) == 0) { + if (nand_scan(mtd, 1) == 0) { + if (!mtd->name) + mtd->name = (char *)default_nand_name; + } else + mtd->name = NULL; + } else { mtd->name = NULL; + mtd->size = 0; + } } |