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

Commit 0cc4b481 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-battery' 

* acpi-battery:
  ACPI / battery: Correctly serialise with the pending async probe
parents 46c13450 5dfa0c73

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ static int __init acpi_battery_init(void) 


static void __exit acpi_battery_exit(void)

{

	async_synchronize_cookie(async_cookie);

	async_synchronize_cookie(async_cookie + 1);

	acpi_bus_unregister_driver(&acpi_battery_driver);

#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_unlock_battery_dir(acpi_battery_dir);