Skip to content

Commit

Permalink
mtd: core: Report error if first mtd_otp_size() call fails in mtd_otp…
Browse files Browse the repository at this point in the history
…_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 <aapo.vienamo@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Michael Walle <mwalle@kernel.org>
Fixes: 4b361cf ("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
  • Loading branch information
Aapo Vienamo authored and miquelraynal committed Mar 25, 2024
1 parent 4cece76 commit d44f0bb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/mtd/mtdcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -956,8 +956,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,
Expand Down

0 comments on commit d44f0bb

Please sign in to comment.