diff options
| author | Yuan Can | 2022-11-24 03:19:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2022-12-31 13:32:45 +0100 |
| commit | b866e8a0b7dc28d7f1b1c4f7d1329b6f0ff5c77d (patch) | |
| tree | 28527eed5019677d588f9c9cb31e71dded8ae2a4 | |
| parent | 42d976bd9766a74ba87f5a8d0dcadda31378b7c7 (diff) | |
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>
| -rw-r--r-- | drivers/power/supply/ab8500_charger.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index c19c50442761..58757a5799f8 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -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) |