]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ACPI: battery: Call power_supply_changed() when adding hooks
authorArmin Wolf <W_Armin@gmx.de>
Wed, 30 Nov 2022 18:41:01 +0000 (19:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Dec 2022 19:29:19 +0000 (20:29 +0100)
If a battery hook is added to a battery, userspace software
is not informed that the available properties of the battery
might have changed. This for example causes upower to react
slowly if a new battery hook is added during runtime.

Fix this by calling power_supply_changed() if a battery hook
was successfully added/removed.

Tested on a Dell Inspiron 3505.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/battery.c

index 306513fec1e1f71ca0c0bb0464d44e4fb3926967..65b4a1da8f55553f1a6a04de579d3c7fd3482a62 100644 (file)
@@ -696,7 +696,8 @@ static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)
        if (lock)
                mutex_lock(&hook_mutex);
        list_for_each_entry(battery, &acpi_battery_list, list) {
-               hook->remove_battery(battery->bat);
+               if (!hook->remove_battery(battery->bat))
+                       power_supply_changed(battery->bat);
        }
        list_del(&hook->list);
        if (lock)
@@ -735,6 +736,8 @@ void battery_hook_register(struct acpi_battery_hook *hook)
                        __battery_hook_unregister(hook, 0);
                        goto end;
                }
+
+               power_supply_changed(battery->bat);
        }
        pr_info("new extension: %s\n", hook->name);
 end: