Merge tag 'linux-kselftest-next-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / drivers / nvmem / core.c

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index b3bc30a..3d87fad 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -824,8 +824,11 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
 
        if (nvmem->nkeepout) {
                rval = nvmem_validate_keepouts(nvmem);
-               if (rval)
-                       goto err_put_device;
+               if (rval) {
+                       ida_free(&nvmem_ida, nvmem->id);
+                       kfree(nvmem);
+                       return ERR_PTR(rval);
+               }
        }
 
        dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);