diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-04 19:43:05 +0900 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-07 14:48:50 +0100 |
| commit | e9d354b4b26aa8fe18b3a6858f2161a43a040e1f (patch) | |
| tree | b1725d8d6a9aa9075625097d2a3cd0c2dba21857 /drivers/mtd/nand | |
| parent | bd93a3af82d5175a86badf7bc0e30d17cc6469ce (diff) | |
| download | linux-e9d354b4b26aa8fe18b3a6858f2161a43a040e1f.tar.gz linux-e9d354b4b26aa8fe18b3a6858f2161a43a040e1f.tar.bz2 linux-e9d354b4b26aa8fe18b3a6858f2161a43a040e1f.zip | |
mtd: nand: vf610: 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>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/vf610_nfc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c index 3ad514c44dcb..3ea4bb19e12d 100644 --- a/drivers/mtd/nand/vf610_nfc.c +++ b/drivers/mtd/nand/vf610_nfc.c @@ -717,10 +717,9 @@ static int vf610_nfc_probe(struct platform_device *pdev) vf610_nfc_preinit_controller(nfc); /* first scan to find the device and get the page size */ - if (nand_scan_ident(mtd, 1, NULL)) { - err = -ENXIO; + err = nand_scan_ident(mtd, 1, NULL); + if (err) goto error; - } vf610_nfc_init_controller(nfc); @@ -775,10 +774,9 @@ static int vf610_nfc_probe(struct platform_device *pdev) } /* second phase scan */ - if (nand_scan_tail(mtd)) { - err = -ENXIO; + err = nand_scan_tail(mtd); + if (err) goto error; - } platform_set_drvdata(pdev, mtd); |