From 7aa194f47b12316ff56daea0e4fdd43ceb7a6cd4 Mon Sep 17 00:00:00 2001 From: Jan Weitzel Date: Tue, 19 Apr 2011 16:15:34 +0200 Subject: [PATCH] --- yaml --- r: 252482 b: refs/heads/master c: a80f1c1f6a15e4eeba5c146ec9c5c0e12458abc5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d0dd98f3409c..57eb829154f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94735ec4044a6d318b83ad3c5794e931ed168d10 +refs/heads/master: a80f1c1f6a15e4eeba5c146ec9c5c0e12458abc5 diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index da9a351c9d79..288423f7b7b1 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/drivers/mtd/nand/omap2.c @@ -1073,9 +1073,9 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) /* DIP switches on some boards change between 8 and 16 bit * bus widths for flash. Try the other width if the first try fails. */ - if (nand_scan(&info->mtd, 1)) { + if (nand_scan_ident(&info->mtd, 1, NULL)) { info->nand.options ^= NAND_BUSWIDTH_16; - if (nand_scan(&info->mtd, 1)) { + if (nand_scan_ident(&info->mtd, 1, NULL)) { err = -ENXIO; goto out_release_mem_region; } @@ -1101,6 +1101,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) info->nand.ecc.layout = &omap_oobinfo; } + /* second phase scan */ + if (nand_scan_tail(&info->mtd)) { + err = -ENXIO; + goto out_release_mem_region; + } + #ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0); if (err > 0)