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

Commit e92677df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Additional ACPI update for v4.7-rc1

  Just one fix for incorrect async_synchronize_cookie() usage in the
  ACPI battery driver (Chris Wilson)"

* tag 'acpi-4.7-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / battery: Correctly serialise with the pending async probe
parents 877c057d 0cc4b481

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);