aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-11-04 06:43:08 -0400
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-11-07 08:48:52 -0500
commit133fe8fa614175eb7e59599dbfe357c7bc7da851 (patch)
treea96a52734b68bff1584a2d577402f6189c05c745 /drivers/mtd
parentc8cae35572b6132e7c3fbb708ebee4b84e29bbed (diff)
mtd: nand: pxa3xx: return error code of nand_scan_ident() on error
The nand_scan_ident() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENODEV. (This driver is already doing so for nand_scan_tail().) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 4c749b030301..649ba8200832 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1680,8 +1680,9 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
1680 chip->ecc.strength = pdata->ecc_strength; 1680 chip->ecc.strength = pdata->ecc_strength;
1681 chip->ecc.size = pdata->ecc_step_size; 1681 chip->ecc.size = pdata->ecc_step_size;
1682 1682
1683 if (nand_scan_ident(mtd, 1, NULL)) 1683 ret = nand_scan_ident(mtd, 1, NULL);
1684 return -ENODEV; 1684 if (ret)
1685 return ret;
1685 1686
1686 if (!pdata->keep_config) { 1687 if (!pdata->keep_config) {
1687 ret = pxa3xx_nand_init(host); 1688 ret = pxa3xx_nand_init(host);