summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/cafe_nand.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-02-26 18:32:56 +0000
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-02-26 18:32:56 +0000
commit5e81e88a4c140586d9212999cea683bcd66a15c6 (patch)
tree1d67825bb2cbcb3830fe4584bac04f6d9413d41a /drivers/mtd/nand/cafe_nand.c
parent9fc51a37a8da84618df7584cad67c078317f6720 (diff)
downloadlinux-3.10-5e81e88a4c140586d9212999cea683bcd66a15c6.tar.gz
linux-3.10-5e81e88a4c140586d9212999cea683bcd66a15c6.tar.bz2
linux-3.10-5e81e88a4c140586d9212999cea683bcd66a15c6.zip
mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident()
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/cafe_nand.c')
-rw-r--r--drivers/mtd/nand/cafe_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 67e2b33f7ef..01a6fe1c780 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -761,7 +761,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
cafe_readl(cafe, GLOBAL_CTRL), cafe_readl(cafe, GLOBAL_IRQ_MASK));
/* Scan to find existence of the device */
- if (nand_scan_ident(mtd, 2)) {
+ if (nand_scan_ident(mtd, 2, NULL)) {
err = -ENXIO;
goto out_irq;
}