summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLuis Henriques <luis.henriques@canonical.com>2015-05-12 00:49:05 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-14 01:58:40 +0300
commiteca21d9167213bc9217450613a671553ab45c225 (patch)
tree078a9760e7b71567dbe3e86cdfdccf6c179e7a6b /drivers/acpi/battery.c
parent479faaf00fde35e80a5be1389938b38e422d799d (diff)
downloadlinux-eca21d9167213bc9217450613a671553ab45c225.tar.xz
ACPI / battery: ensure acpi_battery_init() has finish
Make sure that async function scheduled with async_schedule() has already been executed. Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r--drivers/acpi/battery.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9c676a6f32ce..547e627611e0 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -70,6 +70,7 @@ MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
MODULE_DESCRIPTION("ACPI Battery Driver");
MODULE_LICENSE("GPL");
+static async_cookie_t async_cookie;
static int battery_bix_broken_package;
static int battery_notification_delay_ms;
static unsigned int cache_time = 1000;
@@ -1313,12 +1314,13 @@ static int __init acpi_battery_init(void)
if (acpi_disabled)
return -ENODEV;
- async_schedule(acpi_battery_init_async, NULL);
+ async_cookie = async_schedule(acpi_battery_init_async, NULL);
return 0;
}
static void __exit acpi_battery_exit(void)
{
+ async_synchronize_cookie(async_cookie);
acpi_bus_unregister_driver(&acpi_battery_driver);
#ifdef CONFIG_ACPI_PROCFS_POWER
acpi_unlock_battery_dir(acpi_battery_dir);