target/linux/generic/backport-5.15/424-v6.4-0002-mtd-core-fix-nvmem-error-reporting.patch

   1 From 8bd1d24e6ca3c599dd455b0e1b22f77bab8290eb Mon Sep 17 00:00:00 2001
   2 From: Michael Walle <michael@walle.cc>
   3 Date: Wed, 8 Mar 2023 09:20:19 +0100
   4 Subject: [PATCH] mtd: core: fix nvmem error reporting
   5
   6 The master MTD will only have an associated device if
   7 CONFIG_MTD_PARTITIONED_MASTER is set, thus we cannot use dev_err() on
   8 mtd->dev. Instead use the parent device which is the physical flash
   9 memory.
  10
  11 Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support")
  12 Cc: stable@vger.kernel.org
  13 Signed-off-by: Michael Walle <michael@walle.cc>
  14 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  15 Link: https://lore.kernel.org/linux-mtd/20230308082021.870459-2-michael@walle.cc
  16 ---
  17  drivers/mtd/mtdcore.c | 5 +++--
  18  1 file changed, 3 insertions(+), 2 deletions(-)
  19
  20 --- a/drivers/mtd/mtdcore.c
  21 +++ b/drivers/mtd/mtdcore.c
  22 @@ -946,6 +946,7 @@ static int mtd_nvmem_fact_otp_reg_read(v
  23
  24  static int mtd_otp_nvmem_add(struct mtd_info *mtd)
  25  {
  26 +       struct device *dev = mtd->dev.parent;
  27         struct nvmem_device *nvmem;
  28         ssize_t size;
  29         int err;
  30 @@ -959,7 +960,7 @@ static int mtd_otp_nvmem_add(struct mtd_
  31                         nvmem = mtd_otp_nvmem_register(mtd, "user-otp", size,
  32                                                        mtd_nvmem_user_otp_reg_read);
  33                         if (IS_ERR(nvmem)) {
  34 -                               dev_err(&mtd->dev, "Failed to register OTP NVMEM device\n");
  35 +                               dev_err(dev, "Failed to register OTP NVMEM device\n");
  36                                 return PTR_ERR(nvmem);
  37                         }
  38                         mtd->otp_user_nvmem = nvmem;
  39 @@ -977,7 +978,7 @@ static int mtd_otp_nvmem_add(struct mtd_
  40                         nvmem = mtd_otp_nvmem_register(mtd, "factory-otp", size,
  41                                                        mtd_nvmem_fact_otp_reg_read);
  42                         if (IS_ERR(nvmem)) {
  43 -                               dev_err(&mtd->dev, "Failed to register OTP NVMEM device\n");
  44 +                               dev_err(dev, "Failed to register OTP NVMEM device\n");
  45                                 err = PTR_ERR(nvmem);
  46                                 goto err;
  47                         }