diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2010-12-08 10:40:49 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-12-09 15:34:57 -0500 |
| commit | 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b (patch) | |
| tree | e9058af9058161a2e9e180b85b9dcbebd94f068b | |
| parent | 3151dbb04ad5a5bd6358371c0bfb457216d00205 (diff) | |
| download | linux-stable-3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.tar.gz linux-stable-3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.tar.bz2 linux-stable-3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.zip | |
ACPI battery: update status upon sysfs query
Sometimes the Battery driver doesn't get notifications when it's
plugged/unplugged. And this results in the incorrect Battery
status reported by the power supply sysfs I/F.
Update Battery status first when querying from sysfs.
http://marc.info/?l=linux-acpi&m=128855015826728&w=2
Tested_by: Seblu <seblu@seblu.net>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/battery.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 95649d373071..9fb9d5ac939d 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -130,6 +130,8 @@ struct acpi_battery { unsigned long flags; }; +static int acpi_battery_update(struct acpi_battery *battery); + #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat); inline int acpi_battery_present(struct acpi_battery *battery) @@ -184,6 +186,9 @@ static int acpi_battery_get_property(struct power_supply *psy, int ret = 0; struct acpi_battery *battery = to_acpi_battery(psy); + if (acpi_battery_update(battery)) + return -ENODEV; + if (acpi_battery_present(battery)) { /* run battery update only if it is present */ acpi_battery_get_state(battery); |