diff options
| author | Lei Wen <leiwen@marvell.com> | 2011-01-06 09:48:18 +0800 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-01-12 17:13:10 -0600 |
| commit | 245eb90091f30604211ac77d93aa131b5b950a50 (patch) | |
| tree | 0fdfe8e0b514ab3c8c1c010ba6f822e569b17697 /drivers/mtd/nand/atmel_nand.c | |
| parent | 47fc18f1e72ef1fc68a179c2b674a4c58646afc9 (diff) | |
| download | olio-uboot-2014.01-245eb90091f30604211ac77d93aa131b5b950a50.tar.xz olio-uboot-2014.01-245eb90091f30604211ac77d93aa131b5b950a50.zip | |
mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()
This patch sync with David's patch on Linux for handling nand_scan_ident.
commit 5e81e88a4c140586d9212999cea683bcd66a15c6
Author: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri Feb 26 18:32:56 2010 +0000
mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Lei Wen <leiwen@marvell.com>
Diffstat (limited to 'drivers/mtd/nand/atmel_nand.c')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index d5eb54ad8..ab8bbb3ae 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -296,7 +296,7 @@ int board_nand_init(struct nand_chip *nand) mtd->priv = nand; /* Detect NAND chips */ - if (nand_scan_ident(mtd, 1)) { + if (nand_scan_ident(mtd, 1, NULL)) { printk(KERN_WARNING "NAND Flash not found !\n"); return -ENXIO; } |