Messages in this thread Patch in this message | | | From | Rafał Miłecki <> | Subject | [PATCH] nvmem: fix unregistering device in nvmem_register() error path | Date | Tue, 21 Dec 2021 16:45:50 +0100 |
| |
From: Rafał Miłecki <rafal@milecki.pl>
1. Drop incorrect put_device() calls
If device_register() fails then underlaying device_add() takes care of calling put_device() if needed. There is no need to do that in a driver.
2. Use device_unregister()
Now that we don't call put_device() we can use above helper.
Fixes: 3360acdf8391 ("nvmem: core: fix leaks on registration errors") Cc: Johan Hovold <johan@kernel.org> Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- That put_device() was explicitly added by Johan but after checking device_register() twice I still think it's incorrect. I hope I didn't miss sth obvious and I didn't mess it up. --- drivers/nvmem/core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 785a56e33f69..f7f31af7226f 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -901,12 +901,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) rval = device_register(&nvmem->dev); if (rval) - goto err_put_device; + return ERR_PTR(rval); if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_device_unreg; } if (config->cells) { @@ -932,10 +932,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); -err_put_device: - put_device(&nvmem->dev); +err_device_unreg: + device_unregister(&nvmem->dev); return ERR_PTR(rval); } -- 2.31.1
| |