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

mtd: nand: vf610: 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 bd93a3af

drivers/mtd/nand/vf610_nfc.c

+4 −6
Original line number Diff line number Diff line
@@ -717,10 +717,9 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
	vf610_nfc_preinit_controller(nfc);



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

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

		err = -ENXIO;

	err = nand_scan_ident(mtd, 1, NULL);

	if (err)

		goto error;

	}



	vf610_nfc_init_controller(nfc);
@@ -775,10 +774,9 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
	}



	/* second phase scan */

	if (nand_scan_tail(mtd)) {

		err = -ENXIO;

	err = nand_scan_tail(mtd);

	if (err)

		goto error;

	}



	platform_set_drvdata(pdev, mtd);