Commit b5169d35 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent ce2eaca7
...@@ -2267,10 +2267,9 @@ static int atmel_nand_probe(struct platform_device *pdev) ...@@ -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 = nand_scan_ident(mtd, 1, NULL);
res = -ENXIO; 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) ...@@ -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 = nand_scan_tail(mtd);
res = -ENXIO; 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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment