Message ID | 20240313173425.1325790-2-aapo.vienamo@linux.intel.com |
---|---|
State | Accepted |
Headers | show |
Series | mtd: core: Handle unsupported OTP operations | expand |
On Wed, 2024-03-13 at 17:34:24 UTC, Aapo Vienamo wrote: > 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") 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 5887feb347a4..c365c97e7232 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -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,