mtd: rawnand: fsl_elbc: fix probe function error path (39b77c58) · Commits · 戴 / test

An error after nand_scan_tail() should trigger a nand_cleanup(). The helper mtd_device_parse_register() returns an error code that should be checked and nand_cleanup() called accordingly. However, in this driver, fsl_elbc_chip_remove() which is called upon error already triggers a nand_release() which is wrong, because a nand_release() should be triggered only if an mtd_register() succeeded. Move the nand_release() call out of the fsl_elbc_chip_remove() and put it back in the *_remove() hook. Signed-off-by:

Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by:

Boris Brezillon <boris.brezillon@bootlin.com>

drivers/mtd/nand/raw/fsl_elbc_nand.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -813,8 +813,6 @@ static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv)
		struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand;
		struct mtd_info *mtd = nand_to_mtd(&priv->chip);

		nand_release(mtd);

		kfree(mtd->name);

		if (priv->vbase)
		@@ -926,15 +924,20 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev)

		/* First look for RedBoot table or partitions on the command
		* line, these take precedence over device tree information */
		mtd_device_parse_register(mtd, part_probe_types, NULL,
		NULL, 0);
		ret = mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0);
		if (ret)
		goto cleanup_nand;

		pr_info("eLBC NAND device at 0x%llx, bank %d\n",
		(unsigned long long)res.start, priv->bank);

		return 0;

		cleanup_nand:
		nand_cleanup(&priv->chip);
		err:
		fsl_elbc_chip_remove(priv);

		return ret;
		}

		@@ -942,7 +945,9 @@ static int fsl_elbc_nand_remove(struct platform_device *pdev)
		{
		struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand;
		struct fsl_elbc_mtd *priv = dev_get_drvdata(&pdev->dev);
		struct mtd_info *mtd = nand_to_mtd(&priv->chip);

		nand_release(mtd);
		fsl_elbc_chip_remove(priv);

		mutex_lock(&fsl_elbc_nand_mutex);

Admin message