浏览代码

mtd: nand: atmel: 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 年之前
父节点
当前提交
b5169d35ed
共有 1 个文件被更改,包括 4 次插入6 次删除
  1. 4 6
      drivers/mtd/nand/atmel_nand.c

+ 4 - 6
drivers/mtd/nand/atmel_nand.c

@@ -2267,10 +2267,9 @@ static int atmel_nand_probe(struct platform_device *pdev)
 		dev_info(host->dev, "No DMA support for NAND access.\n");
 		dev_info(host->dev, "No DMA support for NAND access.\n");
 
 
 	/* first scan to find the device and get the page size */
 	/* first scan to find the device and get the page size */
-	if (nand_scan_ident(mtd, 1, NULL)) {
-		res = -ENXIO;
+	res = nand_scan_ident(mtd, 1, NULL);
+	if (res)
 		goto err_scan_ident;
 		goto err_scan_ident;
-	}
 
 
 	if (host->board.on_flash_bbt || on_flash_bbt)
 	if (host->board.on_flash_bbt || on_flash_bbt)
 		nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
 		nand_chip->bbt_options |= NAND_BBT_USE_FLASH;
@@ -2304,10 +2303,9 @@ static int atmel_nand_probe(struct platform_device *pdev)
 	}
 	}
 
 
 	/* second phase scan */
 	/* second phase scan */
-	if (nand_scan_tail(mtd)) {
-		res = -ENXIO;
+	res = nand_scan_tail(mtd);
+	if (res)
 		goto err_scan_tail;
 		goto err_scan_tail;
-	}
 
 
 	mtd->name = "atmel_nand";
 	mtd->name = "atmel_nand";
 	res = mtd_device_register(mtd, host->board.parts,
 	res = mtd_device_register(mtd, host->board.parts,