| Message ID | 20190102143654.24362-1-bbrezillon@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
| Series | [1/2] mtd: Fix the check on nvmem_register() ret code | expand |
śr., 2 sty 2019 o 15:37 Boris Brezillon <bbrezillon@kernel.org> napisał(a): > > Commit 20167b70c894 ("nvmem: use EOPNOTSUPP instead of ENOSYS") changed > the nvmem_register() ret code from ENOSYS to EOPNOTSUPP when > CONFIG_NVMEM is not enabled, but the check in mtd_nvmem_add() was not > adjusted accordingly. > > Cc: Bartosz Golaszewski <brgl@bgdev.pl> > Cc: Alban Bedel <albeu@free.fr> > Fixes: c4dfa25ab307 ("mtd: add support for reading MTD devices via the nvmem API") > Reported-by: kernel test robot <rong.a.chen@intel.com> > Signed-off-by: Boris Brezillon <bbrezillon@kernel.org> > --- > drivers/mtd/mtdcore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c > index 21e3cdc04036..999b705769a8 100644 > --- a/drivers/mtd/mtdcore.c > +++ b/drivers/mtd/mtdcore.c > @@ -522,7 +522,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) > mtd->nvmem = nvmem_register(&config); > if (IS_ERR(mtd->nvmem)) { > /* Just ignore if there is no NVMEM support in the kernel */ > - if (PTR_ERR(mtd->nvmem) == -ENOSYS) { > + if (PTR_ERR(mtd->nvmem) == -EOPNOTSUPP) { > mtd->nvmem = NULL; > } else { > dev_err(&mtd->dev, "Failed to register NVMEM device\n"); > -- > 2.17.1 > Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
From: Boris Brezillon <boris.brezillon@bootlin.com> On Wed, 2019-01-02 at 14:36:53 UTC, Boris Brezillon wrote: > Commit 20167b70c894 ("nvmem: use EOPNOTSUPP instead of ENOSYS") changed > the nvmem_register() ret code from ENOSYS to EOPNOTSUPP when > CONFIG_NVMEM is not enabled, but the check in mtd_nvmem_add() was not > adjusted accordingly. > > Cc: Bartosz Golaszewski <brgl@bgdev.pl> > Cc: Alban Bedel <albeu@free.fr> > Fixes: c4dfa25ab307 ("mtd: add support for reading MTD devices via the nvmem API") > Reported-by: kernel test robot <rong.a.chen@intel.com> > Signed-off-by: Boris Brezillon <bbrezillon@kernel.org> > Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Applied to http://git.infradead.org/linux-mtd.git master, thanks. Boris
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 21e3cdc04036..999b705769a8 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -522,7 +522,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) mtd->nvmem = nvmem_register(&config); if (IS_ERR(mtd->nvmem)) { /* Just ignore if there is no NVMEM support in the kernel */ - if (PTR_ERR(mtd->nvmem) == -ENOSYS) { + if (PTR_ERR(mtd->nvmem) == -EOPNOTSUPP) { mtd->nvmem = NULL; } else { dev_err(&mtd->dev, "Failed to register NVMEM device\n");
Commit 20167b70c894 ("nvmem: use EOPNOTSUPP instead of ENOSYS") changed the nvmem_register() ret code from ENOSYS to EOPNOTSUPP when CONFIG_NVMEM is not enabled, but the check in mtd_nvmem_add() was not adjusted accordingly. Cc: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Alban Bedel <albeu@free.fr> Fixes: c4dfa25ab307 ("mtd: add support for reading MTD devices via the nvmem API") Reported-by: kernel test robot <rong.a.chen@intel.com> Signed-off-by: Boris Brezillon <bbrezillon@kernel.org> --- drivers/mtd/mtdcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)