Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: pmu_battery: Fix battery full reporting

Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: pmu_battery: Fix battery full reporting
53ff7095 · Linus Torvalds · bb7d3f24 · d54e7929 · 53ff7095
Commit 53ff7095 authored Jan 12, 2010 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/power/pmu_battery.c drivers/power/pmu_battery.c +2 -0

No files found.
--- 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;