diff options
author | Len Brown <len.brown@intel.com> | 2007-11-20 01:17:42 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:17:42 -0500 |
commit | 86533e80e0a20ed1a676f9eeb2dde0fa5ff23276 (patch) | |
tree | c645c87f236c42134bf7e06f7cc971685f4b5a5b /drivers/acpi/battery.c | |
parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
parent | 037cbc63fd83162a8ee0c69680207ce4609adbea (diff) | |
download | talos-obmc-linux-86533e80e0a20ed1a676f9eeb2dde0fa5ff23276.tar.gz talos-obmc-linux-86533e80e0a20ed1a676f9eeb2dde0fa5ff23276.zip |
Pull battery into release branch
Diffstat (limited to 'drivers/acpi/battery.c')
-rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 192c244f6190..2e8e790c1180 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -153,6 +153,8 @@ static int acpi_battery_get_property(struct power_supply *psy, val->intval = POWER_SUPPLY_STATUS_CHARGING; else if (battery->state == 0) val->intval = POWER_SUPPLY_STATUS_FULL; + else + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; break; case POWER_SUPPLY_PROP_PRESENT: val->intval = acpi_battery_present(battery); |