Commit da8aeb92 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown

ACPI / Battery: Update information on info notification and resume

A notification event 0x81 from an ACPI battery device requires us to
re-read the battery information structure.  Follow this requirement
and remove and re-create the battery's attibutes in sysfs so that
they reflect the reporting units used by the battery at the moment
(those units may actually change sometimes at run time, which happens
on some Thinkpads).

The approach used in this patch was suggested by Matthew Garrett.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reported-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent d57d09a4
...@@ -631,6 +631,17 @@ static int acpi_battery_update(struct acpi_battery *battery) ...@@ -631,6 +631,17 @@ static int acpi_battery_update(struct acpi_battery *battery)
return result; return result;
} }
static void acpi_battery_refresh(struct acpi_battery *battery)
{
if (!battery->bat.dev)
return;
acpi_battery_get_info(battery);
/* The battery may have changed its reporting units. */
sysfs_remove_battery(battery);
sysfs_add_battery(battery);
}
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
...@@ -916,6 +927,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) ...@@ -916,6 +927,8 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
if (!battery) if (!battery)
return; return;
old = battery->bat.dev; old = battery->bat.dev;
if (event == ACPI_BATTERY_NOTIFY_INFO)
acpi_battery_refresh(battery);
acpi_battery_update(battery); acpi_battery_update(battery);
acpi_bus_generate_proc_event(device, event, acpi_bus_generate_proc_event(device, event,
acpi_battery_present(battery)); acpi_battery_present(battery));
...@@ -985,6 +998,7 @@ static int acpi_battery_resume(struct acpi_device *device) ...@@ -985,6 +998,7 @@ static int acpi_battery_resume(struct acpi_device *device)
if (!device) if (!device)
return -EINVAL; return -EINVAL;
battery = acpi_driver_data(device); battery = acpi_driver_data(device);
acpi_battery_refresh(battery);
battery->update_time = 0; battery->update_time = 0;
acpi_battery_update(battery); acpi_battery_update(battery);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment