Merge branches 'x86/cache', 'x86/debug' and 'x86/irq' into x86/urgent

[karo-tx-linux.git] / drivers / mtd / nand / plat_nand.c

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 415a53a0deeb306bb5baeaf3f5ad6638fd41d103..791de3e4bbb681392a50c510883f00c95cdd47cd 100644 (file)
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -86,10 +86,9 @@ static int plat_nand_probe(struct platform_device *pdev)
        }
 
        /* Scan to find existence of the device */
-       if (nand_scan(mtd, pdata->chip.nr_chips)) {
-               err = -ENXIO;
+       err = nand_scan(mtd, pdata->chip.nr_chips);
+       if (err)
                goto out;
-       }
 
        part_types = pdata->chip.part_probe_types;