Skip to content

Commit

Permalink
mtd: core: clear out unregistered devices a bit more
Browse files Browse the repository at this point in the history
This allows an MTD device that has been unregistered to be easily
re-registered later without triggering spurious "already registered"
warnings in mtd_device_parse_register() and add_mtd_device().

Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20211015185049.3318-1-zev@bewilderbeest.net
  • Loading branch information
zevweiss authored and miquelraynal committed Dec 3, 2021
1 parent b4a0de2 commit 0059657
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/mtd/mtdcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,9 @@ int del_mtd_device(struct mtd_info *mtd)

device_unregister(&mtd->dev);

/* Clear dev so mtd can be safely re-registered later if desired */
memset(&mtd->dev, 0, sizeof(mtd->dev));

idr_remove(&mtd_idr, mtd->index);
of_node_put(mtd_get_of_node(mtd));

Expand Down Expand Up @@ -1018,8 +1021,10 @@ int mtd_device_unregister(struct mtd_info *master)
{
int err;

if (master->_reboot)
if (master->_reboot) {
unregister_reboot_notifier(&master->reboot_notifier);
memset(&master->reboot_notifier, 0, sizeof(master->reboot_notifier));
}

if (master->otp_user_nvmem)
nvmem_unregister(master->otp_user_nvmem);
Expand Down

0 comments on commit 0059657

Please sign in to comment.