From: Nikita Yushchenko <[email protected]>
Improve error path code of nvmem_register() in the following ways:
- Call device_del when call to nvmem_setup_compat() fails, since
at that point device_add has suceeded and we need to undo that.
- Documentation for device_add discorages explicitly freeing
memory occupied by the device even in case of device_add
failure, so to fix that use put_device() instead.
Cc: [email protected]
Cc: Srinivas Kandagatla <[email protected]>
Cc: Maxime Ripard <[email protected]>
Signed-off-by: Nikita Yushchenko <[email protected]>
Signed-off-by: Andrey Smirnov <[email protected]>
---
drivers/nvmem/core.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 408b521..095e3fc 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -488,21 +488,23 @@ struct nvmem_device *nvmem_register(const struct
nvmem_config *config)
rval = device_add(&nvmem->dev);
if (rval)
- goto out;
+ goto err_add;
if (config->compat) {
rval = nvmem_setup_compat(nvmem, config);
if (rval)
- goto out;
+ goto err_compat;
}
if (config->cells)
nvmem_add_cells(nvmem, config);
return nvmem;
-out:
- ida_simple_remove(&nvmem_ida, nvmem->id);
- kfree(nvmem);
+
+err_compat:
+ device_del(&nvmem->dev);
+err_add:
+ put_device(&nvmem->dev);
return ERR_PTR(rval);
}
EXPORT_SYMBOL_GPL(nvmem_register);
--
2.9.3
