Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e81e88a authored by David Woodhouse's avatar David Woodhouse
Browse files

mtd: nand: Allow caller to pass alternative ID table to nand_scan_ident() 



Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9fc51a37

drivers/mtd/nand/atmel_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
	}



	/* first scan to find the device and get the page size */

	if (nand_scan_ident(mtd, 1)) {

	if (nand_scan_ident(mtd, 1, NULL)) {

		res = -ENXIO;

		goto err_scan_ident;

	}

drivers/mtd/nand/bcm_umi_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev) 
	 * layout we'll be using.

	 */



	err = nand_scan_ident(board_mtd, 1);

	err = nand_scan_ident(board_mtd, 1, NULL);

	if (err) {

		printk(KERN_ERR "nand_scan failed: %d\n", err);

		iounmap(bcm_umi_io_base);

drivers/mtd/nand/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/mtd/nand/davinci_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev) 
	spin_unlock_irq(&davinci_nand_lock);



	/* Scan to find existence of the device(s) */

	ret = nand_scan_ident(&info->mtd, pdata->mask_chipsel ? 2 : 1);

	ret = nand_scan_ident(&info->mtd, pdata->mask_chipsel ? 2 : 1, NULL);

	if (ret < 0) {

		dev_dbg(&pdev->dev, "no NAND chip(s) found\n");

		goto err_scan;

drivers/mtd/nand/fsl_elbc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int __devinit fsl_elbc_chip_probe(struct fsl_elbc_ctrl *ctrl, 
	if (ret)

		goto err;



	ret = nand_scan_ident(&priv->mtd, 1);

	ret = nand_scan_ident(&priv->mtd, 1, NULL);

	if (ret)

		goto err;