diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-04 19:43:00 +0900 |
|---|---|---|
| committer |   Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-07 14:48:47 +0100 |
| commit | ad5678ec40764ccd38dd688f5ec5c1c835241abd (patch) | |
| tree | f6c5053d93ab7c2c55ffee404b541d2bed439c08 /drivers/mtd/nand | |
| parent | mtd: nand: brcmnand: return error code of nand_scan_ident/tail() on error (diff) | |
| download | linux-dev-ad5678ec40764ccd38dd688f5ec5c1c835241abd.tar.xz linux-dev-ad5678ec40764ccd38dd688f5ec5c1c835241abd.zip | |
mtd: nand: fsmc: 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: 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/fsmc_nand.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index d4f454a4b35e..4924b43977ef 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -926,8 +926,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) /* * Scan to find existence of the device */ - if (nand_scan_ident(mtd, 1, NULL)) { - ret = -ENXIO; + ret = nand_scan_ident(mtd, 1, NULL); + if (ret) { dev_err(&pdev->dev, "No NAND Device found!\n"); goto err_scan_ident; } @@ -992,10 +992,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) } /* Second stage of scan to fill MTD data-structures */ - if (nand_scan_tail(mtd)) { - ret = -ENXIO; + ret = nand_scan_tail(mtd); + if (ret) goto err_probe; - } /* * The partition information can is accessed by (in the same precedence) |