Commit b5404756 authored May 19, 2020 by Miquel Raynal Committed by Greg Kroah-Hartman Jun 22, 2020

mtd: rawnand: pasemi: Fix the probe error path

commit f51466901c07e6930435d30b02a21f0841174f61 upstream.

nand_cleanup() is supposed to be called on error after a successful
call to nand_scan() to free all NAND resources.

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

Fixes: d44154f9 ("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-41-miquel.raynal@bootlin.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 44a9bf52

drivers/mtd/nand/raw/pasemi_nand.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -146,7 +146,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
	if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {		if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {
	dev_err(dev, "Unable to register MTD device\n");		dev_err(dev, "Unable to register MTD device\n");
	err = -ENODEV;		err = -ENODEV;
	goto out_lpc;		goto out_cleanup_nand;
	}		}

	dev_info(dev, "PA Semi NAND flash at %pR, control at I/O %x\n", &res,		dev_info(dev, "PA Semi NAND flash at %pR, control at I/O %x\n", &res,
	@@ -154,6 +154,8 @@ static int pasemi_nand_probe(struct platform_device *ofdev)

	return 0;		return 0;

			out_cleanup_nand:
			nand_cleanup(chip);
	out_lpc:		out_lpc:
	release_region(lpcctl, 4);		release_region(lpcctl, 4);
	out_ior:		out_ior: