diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 14:05:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-06 14:05:27 +1100 |
| commit | 8f754f3ae8133de6c66f3d8649c9bc6de454f3b8 (patch) | |
| tree | cfc6f04953297f338c98230acbde4f343c9d38c6 | |
| parent | a733d512964fdcc87ef21381abce2bd28b1ca381 (diff) | |
| parent | d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 (diff) | |
Merge remote branch 'battery/master'
| -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; |