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

    [ Upstream commit 34531be5e804a8e1abf314a6c3a19fe342e4a154 ]

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

    There is no real Fixes tag applying here as the use of nand_release()
    in this driver predates the introduction of nand_cleanup() in
    commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources")
    which makes this change possible. However, pointing this commit as the
    culprit for backporting purposes makes sense even if this commit is not
    introducing any bug.

    Fixes: d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources")
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/linux-mtd/20200519130035.1883-61-miquel.raynal@bootlin.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/xway_nand.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
    index d374a0007960a..3d51b8fc5aafe 100644
    --- a/drivers/mtd/nand/xway_nand.c
    +++ b/drivers/mtd/nand/xway_nand.c
    @@ -211,7 +211,7 @@ static int xway_nand_probe(struct platform_device *pdev)

    err = mtd_device_register(mtd, NULL, 0);
    if (err)
    - nand_release(&data->chip);
    + nand_cleanup(&data->chip);

    return err;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:30    [W:2.692 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site