mtd: core: Report error if first mtd_otp_size() call fails in mtd_otp_nvmem_add()

[ Upstream commit d44f0bbbd8d182debcce88bda55b05269f3d33d6 ]

Jump to the error reporting code in mtd_otp_nvmem_add() if the
mtd_otp_size() call fails. Without this fix, the error is not logged.

Signed-off-by: Aapo Vienamo <aapo.vienamo@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Michael Walle <mwalle@kernel.org>
Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240313173425.1325790-2-aapo.vienamo@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 2a228ee32641c1d143ff63906c8929b7eecb88e6..16077e5a2df1c911de0412e6302005201c925e41 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -886,8 +886,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd)
 
        if (mtd->_get_user_prot_info && mtd->_read_user_prot_reg) {
                size = mtd_otp_size(mtd, true);
-               if (size < 0)
-                       return size;
+               if (size < 0) {
+                       err = size;
+                       goto err;
+               }
 
                if (size > 0) {
                        nvmem = mtd_otp_nvmem_register(mtd, "user-otp", size,