Merge branch 'acpi-battery'
* acpi-battery: ACPI / battery: Correctly serialise with the pending async probe
This commit is contained in:
commit
0cc4b48149
1 changed files with 1 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue