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

mtd: nand: denali: return error code from 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 -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 7ebb8d06

drivers/mtd/nand/denali.c

+4 −6
Original line number Diff line number Diff line
@@ -1474,10 +1474,9 @@ int denali_init(struct denali_nand_info *denali) 
	 * this is the first stage in a two step process to register

	 * with the nand subsystem

	 */

	if (nand_scan_ident(mtd, denali->max_banks, NULL)) {

		ret = -ENXIO;

	ret = nand_scan_ident(mtd, denali->max_banks, NULL);

	if (ret)

		goto failed_req_irq;

	}



	/* allocate the right size buffer now */

	devm_kfree(denali->dev, denali->buf.buf);
@@ -1580,10 +1579,9 @@ int denali_init(struct denali_nand_info *denali) 
	denali->nand.ecc.write_oob = denali_write_oob;

	denali->nand.erase = denali_erase;



	if (nand_scan_tail(mtd)) {

		ret = -ENXIO;

	ret = nand_scan_tail(mtd);

	if (ret)

		goto failed_req_irq;

	}



	ret = mtd_device_register(mtd, NULL, 0);

	if (ret) {