Skip to content

Commit d44f0bb

Browse files
Aapo Vienamomiquelraynal
authored andcommitted
mtd: core: Report error if first mtd_otp_size() call fails in mtd_otp_nvmem_add()
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 <[email protected]> Reviewed-by: Mika Westerberg <[email protected]> Reviewed-by: Michael Walle <[email protected]> Fixes: 4b361cf ("mtd: core: add OTP nvmem provider support") Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent 4cece76 commit d44f0bb

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/mtd/mtdcore.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,8 +956,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd)
956956

957957
if (mtd->_get_user_prot_info && mtd->_read_user_prot_reg) {
958958
size = mtd_otp_size(mtd, true);
959-
if (size < 0)
960-
return size;
959+
if (size < 0) {
960+
err = size;
961+
goto err;
962+
}
961963

962964
if (size > 0) {
963965
nvmem = mtd_otp_nvmem_register(mtd, "user-otp", size,

0 commit comments

Comments
 (0)