diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:13:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 21:13:06 -0800 |
| commit | 53ff7095cce683813be075379160b8e4e6ea8b85 (patch) | |
| tree | 723754032e6eb42af3f555946b9786900a8f659c /drivers | |
| parent | bb7d3f24c71e528989501617651b669fbed798cb (diff) | |
| parent | d54e7929d8073b0fff8af16f8ff6ebbba6fc4154 (diff) | |
| download | linux-53ff7095cce683813be075379160b8e4e6ea8b85.tar.bz2 | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
pmu_battery: Fix battery full reporting
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; |