commit 53ff7095cce683813be075379160b8e4e6ea8b85
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 12 21:13:06 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 12 21:13:06 2010 -0800
tree 723754032e6eb42af3f555946b9786900a8f659c
parent bb7d3f24c71e528989501617651b669fbed798cb
parent d54e7929d8073b0fff8af16f8ff6ebbba6fc4154

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

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

drivers/power/pmu_battery.c

diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c
index 9346a86..9c87ad5 100644
--- a/drivers/power/pmu_battery.c
+++ b/drivers/power/pmu_battery.c
@@ -89,6 +89,8 @@
 	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;