lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 190/206] mtd: rawnand: oxnas: Fix the probe error path
    Date
    From: Miquel Raynal <miquel.raynal@bootlin.com>

    [ Upstream commit 154298e2a3f6c9ce1d76cdb48d89fd5b107ea1a3 ]

    nand_release() is supposed be called after MTD device registration.
    Here, only nand_scan() happened, so use nand_cleanup() instead.

    While at it, be consistent and move the function call in the error
    path thanks to a goto statement.

    Fixes: 668592492409 ("mtd: nand: Add OX820 NAND Support")
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-37-miquel.raynal@bootlin.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/raw/oxnas_nand.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/mtd/nand/raw/oxnas_nand.c b/drivers/mtd/nand/raw/oxnas_nand.c
    index 7509bcd961351..d3f274b2e56d2 100644
    --- a/drivers/mtd/nand/raw/oxnas_nand.c
    +++ b/drivers/mtd/nand/raw/oxnas_nand.c
    @@ -147,10 +147,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)
    goto err_release_child;

    err = mtd_device_register(mtd, NULL, 0);
    - if (err) {
    - nand_release(chip);
    - goto err_release_child;
    - }
    + if (err)
    + goto err_cleanup_nand;

    oxnas->chips[nchips] = chip;
    ++nchips;
    @@ -166,6 +164,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)

    return 0;

    +err_cleanup_nand:
    + nand_cleanup(chip);
    err_release_child:
    of_node_put(nand_np);
    err_clk_unprepare:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:57    [W:6.475 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site