All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] nvmem: fix unregistering device in nvmem_register() error path
@ 2021-12-21 15:45 Rafał Miłecki
  2021-12-21 16:06 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 17+ messages in thread
From: Rafał Miłecki @ 2021-12-21 15:45 UTC (permalink / raw)
  To: Srinivas Kandagatla
  Cc: Johan Hovold, Andrey Smirnov, Greg Kroah-Hartman, linux-kernel,
	Rafał Miłecki

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


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2021-12-22 10:35 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-21 15:45 [PATCH] nvmem: fix unregistering device in nvmem_register() error path Rafał Miłecki
2021-12-21 16:06 ` Greg Kroah-Hartman
2021-12-21 17:46   ` Rafał Miłecki
2021-12-22  7:44     ` Greg Kroah-Hartman
2021-12-22  8:38       ` Johan Hovold
2021-12-22  8:56         ` Greg Kroah-Hartman
2021-12-22  9:02           ` Rafał Miłecki
2021-12-22  9:03           ` Johan Hovold
2021-12-22  9:24             ` Johan Hovold
2021-12-22  9:34               ` Greg Kroah-Hartman
2021-12-22  9:00         ` Rafał Miłecki
2021-12-22  9:08           ` Johan Hovold
2021-12-22  9:16             ` Rafał Miłecki
2021-12-22  9:26               ` Johan Hovold
2021-12-22  9:46                 ` Rafał Miłecki
2021-12-22  9:30               ` Greg Kroah-Hartman
2021-12-22  9:29           ` Greg Kroah-Hartman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.