summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-25 22:11:28 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-25 22:11:28 +0200
commit0cc4b48149ff6948dd82a039ad55cdbec49107f7 (patch)
tree0d0e4a091f8bc43c2c2e9d51d1d5f4b1164b9972
parent46c13450624e36302547a2ac3695f2350fe7ffc3 (diff)
parent5dfa0c73953360e07a47731e412d33dfc896bf4e (diff)
downloadlinux-0cc4b48149ff6948dd82a039ad55cdbec49107f7.tar.gz
Merge branch 'acpi-battery'
* acpi-battery: ACPI / battery: Correctly serialise with the pending async probe
-rw-r--r--drivers/acpi/battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index b719ab3090bb..ab234791a0ba 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -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);