mtd: core: fix error path for nvmem provider

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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-3-michael@walle.cc

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c38a13cb8d5e684d4c37a3b1fa2c27eb3d83570a..0bc9676fe029920f3e791a52c282e5c6ec638e2b 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -1023,10 +1023,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 */
@@ -1061,9 +1065,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);