mtd: nand: omap2: return error code of nand_scan_ident/tail() on error (bd93a3af) · Commits · 戴 / test

The nand_scan_ident/tail() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENXIO. Signed-off-by:

drivers/mtd/nand/omap2.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1895,10 +1895,10 @@ static int omap_nand_probe(struct platform_device *pdev)

		/* scan NAND device connected to chip controller */
		nand_chip->options \|= info->devsize & NAND_BUSWIDTH_16;
		if (nand_scan_ident(mtd, 1, NULL)) {
		err = nand_scan_ident(mtd, 1, NULL);
		if (err) {
		dev_err(&info->pdev->dev,
		"scan failed, may be bus-width mismatch\n");
		err = -ENXIO;
		goto return_error;
		}

		@@ -2154,10 +2154,9 @@ static int omap_nand_probe(struct platform_device *pdev)

		scan_tail:
		/* second phase scan */
		if (nand_scan_tail(mtd)) {
		err = -ENXIO;
		err = nand_scan_tail(mtd);
		if (err)
		goto return_error;
		}

		if (dev->of_node)
		mtd_device_register(mtd, NULL, 0);