diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 13:17:52 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 13:17:52 +1100 |
commit | af975d27f27a180fa5f49c097156e07b560dfc2d (patch) | |
tree | 2e9907b1646f0b2e38a6331352ea633fd87dfc34 /drivers | |
parent | 022de33a132eb1b0d7af54830eaa03062a4edbdc (diff) | |
parent | d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 (diff) |
Merge remote branch 'battery/master'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/power/pmu_battery.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c index 9346a862f1f2..9c87ad564803 100644 --- a/drivers/power/pmu_battery.c +++ b/drivers/power/pmu_battery.c @@ -89,6 +89,8 @@ static int pmu_bat_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_STATUS: if (pbi->flags & PMU_BATT_CHARGING) val->intval = POWER_SUPPLY_STATUS_CHARGING; + else if (pmu_power_flags & PMU_PWR_AC_PRESENT) + val->intval = POWER_SUPPLY_STATUS_FULL; else val->intval = POWER_SUPPLY_STATUS_DISCHARGING; break; |