Commit 522ec2df authored by Miquel Raynal's avatar Miquel Raynal Committed by Greg Kroah-Hartman

mtd: rawnand: marvell: Fix probe error path

commit c525b7af upstream.

Ensure all chips are deregistered and cleaned in case of error during
the probe.

Fixes: 02f26ecf ("mtd: nand: add reworked Marvell NAND controller driver")
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Link: https://lore.kernel.org/linux-mtd/20200424164501.26719-5-miquel.raynal@bootlin.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b278001a
...@@ -2573,6 +2573,16 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, ...@@ -2573,6 +2573,16 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc,
return 0; return 0;
} }
static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc)
{
struct marvell_nand_chip *entry, *temp;
list_for_each_entry_safe(entry, temp, &nfc->chips, node) {
nand_release(&entry->chip);
list_del(&entry->node);
}
}
static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc)
{ {
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
...@@ -2607,21 +2617,16 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) ...@@ -2607,21 +2617,16 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc)
ret = marvell_nand_chip_init(dev, nfc, nand_np); ret = marvell_nand_chip_init(dev, nfc, nand_np);
if (ret) { if (ret) {
of_node_put(nand_np); of_node_put(nand_np);
return ret; goto cleanup_chips;
} }
} }
return 0; return 0;
}
static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc) cleanup_chips:
{ marvell_nand_chips_cleanup(nfc);
struct marvell_nand_chip *entry, *temp;
list_for_each_entry_safe(entry, temp, &nfc->chips, node) { return ret;
nand_release(&entry->chip);
list_del(&entry->node);
}
} }
static int marvell_nfc_init_dma(struct marvell_nfc *nfc) static int marvell_nfc_init_dma(struct marvell_nfc *nfc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment