xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: nand: denali: return error code from 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 -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-09 13:35:28 +09:00
committed by Boris Brezillon
parent 7ebb8d0678
commit a227d4e4c3
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1474,10 +1474,9 @@ int denali_init(struct denali_nand_info *denali)
* this is the first stage in a two step process to register * this is the first stage in a two step process to register
* with the nand subsystem * with the nand subsystem
*/ */
if (nand_scan_ident(mtd, denali->max_banks, NULL)) { ret = nand_scan_ident(mtd, denali->max_banks, NULL);
ret = -ENXIO; if (ret)
goto failed_req_irq; goto failed_req_irq;
}
/* allocate the right size buffer now */ /* allocate the right size buffer now */
devm_kfree(denali->dev, denali->buf.buf); devm_kfree(denali->dev, denali->buf.buf);
@@ -1580,10 +1579,9 @@ int denali_init(struct denali_nand_info *denali)
denali->nand.ecc.write_oob = denali_write_oob; denali->nand.ecc.write_oob = denali_write_oob;
denali->nand.erase = denali_erase; denali->nand.erase = denali_erase;
if (nand_scan_tail(mtd)) { ret = nand_scan_tail(mtd);
ret = -ENXIO; if (ret)
goto failed_req_irq; goto failed_req_irq;
}
ret = mtd_device_register(mtd, NULL, 0); ret = mtd_device_register(mtd, NULL, 0);
if (ret) { if (ret) {