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

[ Upstream commit c4d33381b134da188ccd1084aef21e2b8c3c422e ]

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")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index 15eadaf46f144247f60badfa0d3435fcfdb188c3..a4f766fc7c9d7cf1332d54919b7fd8cc3f29d00d 100644 (file)
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -3726,7 +3726,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)