Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

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

diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 0b0c93702abbd43c96b4e48eda148db9d36ddbee..d40c32d311d8f9cb95ca20fd07cee000d7b69956 100644 (file)
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -725,10 +725,9 @@ static int cafe_nand_probe(struct pci_dev *pdev,
        usedma = 0;
 
        /* Scan to find existence of the device */
-       if (nand_scan_ident(mtd, 2, NULL)) {
-               err = -ENXIO;
+       err = nand_scan_ident(mtd, 2, NULL);
+       if (err)
                goto out_irq;
-       }
 
        cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev,
                                2112 + sizeof(struct nand_buffers) +