Commit 281f7a6c authored by Michael Walle's avatar Michael Walle Committed by Miquel Raynal
Browse files

mtd: core: prepare mtd_otp_nvmem_add() to handle -EPROBE_DEFER 



NVMEM soon will get the ability for nvmem layouts and these might
not be ready when nvmem_register() is called and thus it might
return -EPROBE_DEFER. Don't print the error message in this case.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-4-michael@walle.cc
parent e0489f6e

drivers/mtd/mtdcore.c

+3 −4
Original line number Diff line number Diff line
@@ -953,8 +953,8 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) 
			nvmem = mtd_otp_nvmem_register(mtd, "user-otp", size,

						       mtd_nvmem_user_otp_reg_read);

			if (IS_ERR(nvmem)) {

				dev_err(dev, "Failed to register OTP NVMEM device\n");

				return PTR_ERR(nvmem);

				err = PTR_ERR(nvmem);

				goto err;

			}

			mtd->otp_user_nvmem = nvmem;

		}
@@ -971,7 +971,6 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) 
			nvmem = mtd_otp_nvmem_register(mtd, "factory-otp", size,

						       mtd_nvmem_fact_otp_reg_read);

			if (IS_ERR(nvmem)) {

				dev_err(dev, "Failed to register OTP NVMEM device\n");

				err = PTR_ERR(nvmem);

				goto err;

			}
@@ -983,7 +982,7 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) 


err:

	nvmem_unregister(mtd->otp_user_nvmem);

	return err;

	return dev_err_probe(dev, err, "Failed to register OTP NVMEM device\n");

}



/**