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>

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index d4f454a4b35e7e5ed8aff7a6d5a326c86d62032f..4924b43977ef8b1e2781dee0f980b5bf10950737 100644 (file)
--- 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)