Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc39fbcf authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

ACPI / battery: Fix acpi_battery_exit on acpi_battery_init_async errors 



The acpi_lock_battery_dir() / acpi_bus_register_driver() calls in
acpi_battery_init_async() may fail.

Check that they succeeded before undoing them.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8661423e

drivers/acpi/battery.c

+6 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ MODULE_DESCRIPTION("ACPI Battery Driver"); 
MODULE_LICENSE("GPL");



static async_cookie_t async_cookie;

static bool battery_driver_registered;

static int battery_bix_broken_package;

static int battery_notification_delay_ms;

static unsigned int cache_time = 1000;
@@ -1329,6 +1330,7 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) 
	if (result < 0)

		acpi_unlock_battery_dir(acpi_battery_dir);

#endif

	battery_driver_registered = (result == 0);

}



static int __init acpi_battery_init(void)
@@ -1343,8 +1345,10 @@ static int __init acpi_battery_init(void) 
static void __exit acpi_battery_exit(void)

{

	async_synchronize_cookie(async_cookie + 1);

	if (battery_driver_registered)

		acpi_bus_unregister_driver(&acpi_battery_driver);

#ifdef CONFIG_ACPI_PROCFS_POWER

	if (acpi_battery_dir)

		acpi_unlock_battery_dir(acpi_battery_dir);

#endif

}