aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-11-04 19:42:49 +0900
committerBoris Brezillon <boris.brezillon@free-electrons.com>2016-11-07 14:48:41 +0100
commit0d0aa866ffa45471b12c9b9c5c48cbc02dcca59b (patch)
tree7b07d7fe5f315ec6150d289122c71d5088a7d0e4 /drivers/mtd/nand
parentmtd: nand: change return type of nand_get_flash_type() to int (diff)
downloadlinux-dev-0d0aa866ffa45471b12c9b9c5c48cbc02dcca59b.tar.xz
linux-dev-0d0aa866ffa45471b12c9b9c5c48cbc02dcca59b.zip
mtd: nand: ams-delta: return error code of nand_scan() on error
The nand_scan() returns an appropriate error value when it fails. Use it instead of the fixed error code -ENXIO. 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/ams-delta.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 78e12cc8bac2..5d6c26f3cf7f 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -234,10 +234,9 @@ static int ams_delta_init(struct platform_device *pdev)
goto out_gpio;
/* Scan to find existence of the device */
- if (nand_scan(ams_delta_mtd, 1)) {
- err = -ENXIO;
+ err = nand_scan(ams_delta_mtd, 1);
+ if (err)
goto out_mtd;
- }
/* Register the partitions */
mtd_device_register(ams_delta_mtd, partition_info,