nvmem: core: fix error handling while validating keepout regions

Current error path on failure of validating keepout regions is calling
put_device, eventhough the device is not even registered at that point.

Fix this by adding proper error handling of freeing ida and nvmem.

Fixes: fd3bb8f54a88 ("nvmem: core: Add support for keepout regions")
Cc: <stable@vger.kernel.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210806085947.22682-5-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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);