Skip to contentSkip to conversation

power: supply: ab8500: Fix error handling in ab8500_charger_init()

PATCH In review Yuan Can 2 participants 2 messages Nov 24, 2022 – Nov 26, 2022

Subsystems (2)
lore
Share & tools
lore

Yuan Can

author
#0 lore raw

PATCH 1/1 power: supply: ab8500: Fix error handling in ab8500_charger_init()

The ab8500_charger_init() returns the platform_driver_register() directly without checking its return value, if platform_driver_register() failed, all ab8500_charger_component_drivers are not unregistered.

Fix by unregister ab8500_charger_component_drivers when platform_driver_register() failed.

Fixes 1c1f13a006ed ("power: supply: ab8500: Move to componentized binding")
---
 drivers/power/supply/ab8500_charger.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/power/supply/ab8500_charger.c +8 -1
index c19c50442761..58757a5799f8 100644
@@ -3719,7 +3719,14 @@ static int __init ab8500_charger_init(void)
 	if (ret)
 		return ret;
 
-	return platform_driver_register(&ab8500_charger_driver);
+	ret = platform_driver_register(&ab8500_charger_driver);
+	if (ret) {
+		platform_unregister_drivers(ab8500_charger_component_drivers,
+				ARRAY_SIZE(ab8500_charger_component_drivers));
+		return ret;
+	}
+
+	return 0;
 }
 
 static void __exit ab8500_charger_exit(void)
Signature · 1 line
2.17.1
#1 lore raw

Hi,

Quoted 10 lines · Yuan Can

The ab8500_charger_init() returns the platform_driver_register() directly without checking its return value, if platform_driver_register() failed, all ab8500_charger_component_drivers are not unregistered.

Fix by unregister ab8500_charger_component_drivers when platform_driver_register() failed.

Fixes 1c1f13a006ed ("power: supply: ab8500: Move to componentized binding")

---

Thanks, queued.

-- Sebastian

Quoted 26 lines
 drivers/power/supply/ab8500_charger.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/power/supply/ab8500_charger.c +8 -1
index c19c50442761..58757a5799f8 100644
@@ -3719,7 +3719,14 @@ static int __init ab8500_charger_init(void)
 	if (ret)
 		return ret;
 
-	return platform_driver_register(&ab8500_charger_driver);
+	ret = platform_driver_register(&ab8500_charger_driver);
+	if (ret) {
+		platform_unregister_drivers(ab8500_charger_component_drivers,
+				ARRAY_SIZE(ab8500_charger_component_drivers));
+		return ret;
+	}
+
+	return 0;
 }
 
 static void __exit ab8500_charger_exit(void)
Signature · 1 line
2.17.1