From: Zijun Hu <quic_zijuhu@quicinc.com>
Date: Sat, 27 Jul 2024 06:08:34 +0000 (+0800)
Subject: driver core: bus: Add simple error handling for buses_init()
X-Git-Tag: v6.12-rc1~32^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bdf3b83515ead3b3fdf93610e4a3bb9a89bc852;p=thirdparty%2Fkernel%2Fstable.git

driver core: bus: Add simple error handling for buses_init()

Add simple error handling for buses_init() since it is easy to do.

Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20240727-buses_init-v1-1-e863295a2c0e@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 8bf04d5ef51d9..5bb1dca96242b 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -1387,8 +1387,13 @@ int __init buses_init(void)
 		return -ENOMEM;
 
 	system_kset = kset_create_and_add("system", NULL, &devices_kset->kobj);
-	if (!system_kset)
+	if (!system_kset) {
+		/* Do error handling here as devices_init() do */
+		kset_unregister(bus_kset);
+		bus_kset = NULL;
+		pr_err("%s: failed to create and add kset 'bus'\n", __func__);
 		return -ENOMEM;
+	}
 
 	return 0;
 }