Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc...

[linux-block.git] / drivers / mtd / nand / lpc32xx_mlc.c

diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 852388171f2033320e7cba102c3be24d312c0f03..5553a5d9efd1144b276a20290f5cb2be9fc302f0 100644 (file)
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -747,10 +747,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
         * Scan to find existance of the device and
         * Get the type of NAND device SMALL block or LARGE block
         */
-       if (nand_scan_ident(mtd, 1, NULL)) {
-               res = -ENXIO;
+       res = nand_scan_ident(mtd, 1, NULL);
+       if (res)
                goto err_exit3;
-       }
 
        host->dma_buf = devm_kzalloc(&pdev->dev, mtd->writesize, GFP_KERNEL);
        if (!host->dma_buf) {
@@ -793,10 +792,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
         * Fills out all the uninitialized function pointers with the defaults
         * And scans for a bad block table if appropriate.
         */
-       if (nand_scan_tail(mtd)) {
-               res = -ENXIO;
+       res = nand_scan_tail(mtd);
+       if (res)
                goto err_exit4;
-       }
 
        mtd->name = DRV_NAME;