summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-11-04 19:43:07 +0900
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-11-07 14:48:51 +0100
commitc8cae35572b6132e7c3fbb708ebee4b84e29bbed (patch)
treefc310a2d7e3f979f4b5fc8a0cdeb3227f71f32d3 /drivers/mtd/nand
parent72480e4e9537fe7c8b9ccc980873665676002808 (diff)
downloadop-kernel-dev-c8cae35572b6132e7c3fbb708ebee4b84e29bbed.zip
op-kernel-dev-c8cae35572b6132e7c3fbb708ebee4b84e29bbed.tar.gz
mtd: nand: hisi504: 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/nand')
-rw-r--r--drivers/mtd/nand/hisi504_nand.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 9432546..e40364e 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -774,10 +774,8 @@ static int hisi_nfc_probe(struct platform_device *pdev)
}
ret = nand_scan_ident(mtd, max_chips, NULL);
- if (ret) {
- ret = -ENODEV;
+ if (ret)
goto err_res;
- }
host->buffer = dmam_alloc_coherent(dev, mtd->writesize + mtd->oobsize,
&host->dma_buffer, GFP_KERNEL);
OpenPOWER on IntegriCloud