iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: nand: fsmc: 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:00 +09:00 committed by Boris Brezillon
parent c25cca0336
commit ad5678ec40
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/fsmc_nand.c
View File

@ -926,8 +926,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
/* /*
* Scan to find existence of the device * Scan to find existence of the device
*/ */
if (nand_scan_ident(mtd, 1, NULL)) { ret = nand_scan_ident(mtd, 1, NULL);
ret = -ENXIO; if (ret) {
dev_err(&pdev->dev, "No NAND Device found!\n"); dev_err(&pdev->dev, "No NAND Device found!\n");
goto err_scan_ident; goto err_scan_ident;
} }
@ -992,10 +992,9 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
} }
/* Second stage of scan to fill MTD data-structures */ /* Second stage of scan to fill MTD data-structures */
if (nand_scan_tail(mtd)) { ret = nand_scan_tail(mtd);
ret = -ENXIO; if (ret)
goto err_probe; goto err_probe;
}
/* /*
* The partition information can is accessed by (in the same precedence) * The partition information can is accessed by (in the same precedence)