Merge branch 'acpi-battery'

* acpi-battery: ACPI / battery: Correctly serialise with the pending async probe

Merge branch 'acpi-battery'
* acpi-battery: ACPI / battery: Correctly serialise with the pending async probe
0cc4b481 · Rafael J. Wysocki · 46c13450 · 5dfa0c73 · 0cc4b481
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

drivers/acpi/battery.c drivers/acpi/battery.c +1 -1

未找到文件。
--- 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);