diff options
author | Zev Weiss <zev@bewilderbeest.net> | 2021-10-15 11:50:48 -0700 |
---|---|---|
committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-12-03 14:27:19 +0100 |
commit | 00596576a05145a1b5672897a82ef87af00becf4 (patch) | |
tree | 4bc5ea007f42691f4a9dc885424e019bd074ad3f /drivers/mtd | |
parent | b4a0de29f083cf8a705e1f381076ceeed7010d50 (diff) | |
download | linux-00596576a05145a1b5672897a82ef87af00becf4.tar.bz2 |
mtd: core: clear out unregistered devices a bit more
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
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/mtdcore.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index fc0bed14bfb1..a7723a708ea7 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -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)); @@ -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); |