mtd: nand: pasemi: return error code of nand_scan() on error

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Fri Dec 16 11:59:06 PST 2016


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=4e5af27e2a3a393558936b82fece1942ec49f534
Commit:     4e5af27e2a3a393558936b82fece1942ec49f534
Parent:     6c34ad7d17849bbfaf362d7c5bed11d80c1cdab4
Author:     Masahiro Yamada <yamada.masahiro at socionext.com>
AuthorDate: Fri Nov 4 19:42:56 2016 +0900
Committer:  Boris Brezillon <boris.brezillon at free-electrons.com>
CommitDate: Mon Nov 7 14:48:45 2016 +0100

    mtd: nand: pasemi: 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 at socionext.com>
    Reviewed-by: Marek Vasut <marek.vasut at gmail.com>
    Signed-off-by: Boris Brezillon <boris.brezillon at free-electrons.com>
---
 drivers/mtd/nand/pasemi_nand.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 5de7591..074b8b0 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -156,10 +156,9 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
 	chip->bbt_options = NAND_BBT_USE_FLASH;
 
 	/* Scan to find existence of the device */
-	if (nand_scan(pasemi_nand_mtd, 1)) {
-		err = -ENXIO;
+	err = nand_scan(pasemi_nand_mtd, 1);
+	if (err)
 		goto out_lpc;
-	}
 
 	if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {
 		dev_err(dev, "Unable to register MTD device\n");



More information about the linux-mtd-cvs mailing list