Commit bc83c788 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon
Browse files

mtd: nand: mxc: return error code of nand_scan_ident/tail() on error 



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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent f0dbe4aa

drivers/mtd/nand/mxc_nand.c

+4 −6
Original line number Diff line number Diff line
@@ -1747,10 +1747,9 @@ static int mxcnd_probe(struct platform_device *pdev) 
	}



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

	if (nand_scan_ident(mtd, is_imx25_nfc(host) ? 4 : 1, NULL)) {

		err = -ENXIO;

	err = nand_scan_ident(mtd, is_imx25_nfc(host) ? 4 : 1, NULL);

	if (err)

		goto escan;

	}



	switch (this->ecc.mode) {

	case NAND_ECC_HW:
@@ -1808,10 +1807,9 @@ static int mxcnd_probe(struct platform_device *pdev) 
	}



	/* second phase scan */

	if (nand_scan_tail(mtd)) {

		err = -ENXIO;

	err = nand_scan_tail(mtd);

	if (err)

		goto escan;

	}



	/* Register the partitions */

	mtd_device_parse_register(mtd, part_probes,