]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mtd: nand: tmio: return error code of nand_scan() on error
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 4 Nov 2016 10:42:54 +0000 (19:42 +0900)
committerBoris Brezillon <boris.brezillon@free-electrons.com>
Mon, 7 Nov 2016 13:48:44 +0000 (14:48 +0100)
The nand_scan() returns an appropriate error value when it fails.
Use it instead of the fixed error code -ENODEV.

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>
drivers/mtd/nand/tmio_nand.c

index 08b30549ec0a0e61f3cd236102f77f6ad9e16097..fc5e773f8b6015955bed0737116cbf532a299ecb 100644 (file)
@@ -435,10 +435,10 @@ static int tmio_probe(struct platform_device *dev)
        nand_chip->waitfunc = tmio_nand_wait;
 
        /* Scan to find existence of the device */
-       if (nand_scan(mtd, 1)) {
-               retval = -ENODEV;
+       retval = nand_scan(mtd, 1);
+       if (retval)
                goto err_irq;
-       }
+
        /* Register the partitions */
        retval = mtd_device_parse_register(mtd, NULL, NULL,
                                           data ? data->partition : NULL,