|
@@ -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);
|