瀏覽代碼

mtd: nand: omap2: return error code of nand_scan_ident/tail() on error

The nand_scan_ident/tail() returns an appropriate error value when
it fails.  Use it instead of the fixed error code -ENXIO.

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>
Masahiro Yamada 8 年之前
父節點
當前提交
bd93a3af82
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      drivers/mtd/nand/omap2.c

+ 4 - 5
drivers/mtd/nand/omap2.c

@@ -1895,10 +1895,10 @@ static int omap_nand_probe(struct platform_device *pdev)
 
 
 	/* scan NAND device connected to chip controller */
 	/* scan NAND device connected to chip controller */
 	nand_chip->options |= info->devsize & NAND_BUSWIDTH_16;
 	nand_chip->options |= info->devsize & NAND_BUSWIDTH_16;
-	if (nand_scan_ident(mtd, 1, NULL)) {
+	err = nand_scan_ident(mtd, 1, NULL);
+	if (err) {
 		dev_err(&info->pdev->dev,
 		dev_err(&info->pdev->dev,
 			"scan failed, may be bus-width mismatch\n");
 			"scan failed, may be bus-width mismatch\n");
-		err = -ENXIO;
 		goto return_error;
 		goto return_error;
 	}
 	}
 
 
@@ -2154,10 +2154,9 @@ static int omap_nand_probe(struct platform_device *pdev)
 
 
 scan_tail:
 scan_tail:
 	/* second phase scan */
 	/* second phase scan */
-	if (nand_scan_tail(mtd)) {
-		err = -ENXIO;
+	err = nand_scan_tail(mtd);
+	if (err)
 		goto return_error;
 		goto return_error;
-	}
 
 
 	if (dev->of_node)
 	if (dev->of_node)
 		mtd_device_register(mtd, NULL, 0);
 		mtd_device_register(mtd, NULL, 0);