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

mtd: nand: brcmnand: 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 b5169d35

drivers/mtd/nand/brcmnand/brcmnand.c

+6 −4
Original line number Diff line number Diff line
@@ -2209,8 +2209,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 
	nand_writereg(ctrl, cfg_offs,

		      nand_readreg(ctrl, cfg_offs) & ~CFG_BUS_WIDTH);



	if (nand_scan_ident(mtd, 1, NULL))

		return -ENXIO;

	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret)

		return ret;



	chip->options |= NAND_NO_SUBPAGE_WRITE;

	/*
@@ -2234,8 +2235,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 
	if (ret)

		return ret;



	if (nand_scan_tail(mtd))

		return -ENXIO;

	ret = nand_scan_tail(mtd);

	if (ret)

		return ret;



	return mtd_device_register(mtd, NULL, 0);

}