| Message ID | 20230306125805.678668-3-michael@walle.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/4] mtd: core: provide unique name for nvmem device, take two | expand |
On Mon, 2023-03-06 at 12:58:04 UTC, Michael Walle wrote: > If mtd_otp_nvmem_add() fails, the partitions won't be removed > because there is simply no call to del_mtd_partitions(). > Unfortunately, add_mtd_partitions() will print all partitions to > the kernel console. If mtd_otp_nvmem_add() returns -EPROBE_DEFER > this would print the partitions multiple times to the kernel > console. Instead move mtd_otp_nvmem_add() to the beginning of the > function. > > Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support") > Cc: stable@vger.kernel.org > Signed-off-by: Michael Walle <michael@walle.cc> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 4a19e69fb77b..d6675bf03557 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1022,10 +1022,14 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types, mtd_set_dev_defaults(mtd); + ret = mtd_otp_nvmem_add(mtd); + if (ret) + goto out; + if (IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) { ret = add_mtd_device(mtd); if (ret) - return ret; + goto out; } /* Prefer parsed partitions over driver-provided fallback */ @@ -1060,9 +1064,12 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types, register_reboot_notifier(&mtd->reboot_notifier); } - ret = mtd_otp_nvmem_add(mtd); - out: + if (ret) { + nvmem_unregister(mtd->otp_user_nvmem); + nvmem_unregister(mtd->otp_factory_nvmem); + } + if (ret && device_is_registered(&mtd->dev)) del_mtd_device(mtd);
If mtd_otp_nvmem_add() fails, the partitions won't be removed because there is simply no call to del_mtd_partitions(). Unfortunately, add_mtd_partitions() will print all partitions to the kernel console. If mtd_otp_nvmem_add() returns -EPROBE_DEFER this would print the partitions multiple times to the kernel console. Instead move mtd_otp_nvmem_add() to the beginning of the function. Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support") Cc: stable@vger.kernel.org Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/mtdcore.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)