lkml.org 
[lkml]   [2016]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/22] mtd: nand: fsmc: return error code of nand_scan_ident/tail() on error
    Date
    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>
    ---

    drivers/mtd/nand/fsmc_nand.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
    index d4f454a..4924b43 100644
    --- a/drivers/mtd/nand/fsmc_nand.c
    +++ b/drivers/mtd/nand/fsmc_nand.c
    @@ -926,8 +926,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
    /*
    * Scan to find existence of the device
    */
    - if (nand_scan_ident(mtd, 1, NULL)) {
    - ret = -ENXIO;
    + ret = nand_scan_ident(mtd, 1, NULL);
    + if (ret) {
    dev_err(&pdev->dev, "No NAND Device found!\n");
    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 */
    - if (nand_scan_tail(mtd)) {
    - ret = -ENXIO;
    + ret = nand_scan_tail(mtd);
    + if (ret)
    goto err_probe;
    - }

    /*
    * The partition information can is accessed by (in the same precedence)
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-11-04 11:47    [W:3.016 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site