Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 17:43:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2016-11-04 19:43:04 +09:00 committed by Boris Brezillon
parent bc83c78871
commit bd93a3af82
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/nand/omap2.c
View File

@ -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 = nand_scan_tail(mtd);
err = -ENXIO; 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);