2013-11-01 00:16:20

by Wei Yongjun

Subject: [PATCH -next] mtd: nand: omap: fix error return code in omap_nand_probe()

From: Wei Yongjun <[email protected]>

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/mtd/nand/omap2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index ec40b8d..f777250 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1953,7 +1953,8 @@ static int omap_nand_probe(struct platform_device *pdev)
nand_chip->ecc.read_page = omap_read_page_bch;
nand_chip->ecc.write_page = omap_write_page_bch;
/* This ECC scheme requires ELM H/W block */
- if (is_elm_present(info, pdata->elm_of_node, BCH8_ECC) < 0) {
+ err = is_elm_present(info, pdata->elm_of_node, BCH8_ECC);
+ if (err < 0) {
pr_err("nand: error: could not initialize ELM\n");
goto return_error;
}

2013-11-01 02:18:22

by Jingoo Han

Subject: Re: [PATCH -next] mtd: nand: omap: fix error return code in omap_nand_probe()

On Friday, November 01, 2013 9:16 AM, Wei Yongjun wrote:
>
> From: Wei Yongjun <[email protected]>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.

Commit message is right? :-(

Best regards,
Jingoo Han

>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/mtd/nand/omap2.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index ec40b8d..f777250 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -1953,7 +1953,8 @@ static int omap_nand_probe(struct platform_device *pdev)
> nand_chip->ecc.read_page = omap_read_page_bch;
> nand_chip->ecc.write_page = omap_write_page_bch;
> /* This ECC scheme requires ELM H/W block */
> - if (is_elm_present(info, pdata->elm_of_node, BCH8_ECC) < 0) {
> + err = is_elm_present(info, pdata->elm_of_node, BCH8_ECC);
> + if (err < 0) {
> pr_err("nand: error: could not initialize ELM\n");
> goto return_error;
> }