diff options
| author |  Aapo Vienamo <aapo.vienamo@linux.intel.com>
| 2024-03-13 19:34:24 +0200 |
|---|---|---|
| committer |  Miquel Raynal <miquel.raynal@bootlin.com>
| 2024-03-25 10:26:53 +0100 |
| commit | d44f0bbbd8d182debcce88bda55b05269f3d33d6 (patch) | |
| tree | 2ec2a1a9b452bc474a579db89b3d4ac9836b3ca8 /drivers/mtd | |
| parent | Linux 6.9-rc1 (diff) | |
| download | linux-d44f0bbbd8d182debcce88bda55b05269f3d33d6.tar.gz linux-d44f0bbbd8d182debcce88bda55b05269f3d33d6.tar.bz2 linux-d44f0bbbd8d182debcce88bda55b05269f3d33d6.zip | |
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 <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
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/mtdcore.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, |