hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

10
drivers/mtd/nand/vf610_nfc.c
View File

@ -717,10 +717,9 @@ static int vf610_nfc_probe(struct platform_device *pdev)
vf610_nfc_preinit_controller(nfc); vf610_nfc_preinit_controller(nfc);
/* 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)) { err = nand_scan_ident(mtd, 1, NULL);
err = -ENXIO; if (err)
goto error; goto error;
}
vf610_nfc_init_controller(nfc); vf610_nfc_init_controller(nfc);
@ -775,10 +774,9 @@ static int vf610_nfc_probe(struct platform_device *pdev)
} }
/* second phase scan */ /* second phase scan */
if (nand_scan_tail(mtd)) { err = nand_scan_tail(mtd);
err = -ENXIO; if (err)
goto error; goto error;
}
platform_set_drvdata(pdev, mtd); platform_set_drvdata(pdev, mtd);