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

* git://git.infradead.org/battery-2.6: pmu_battery: Fix battery full reporting
mariux64 · Jan 13, 2010 · 53ff709 · 53ff709
2 parents bb7d3f2 + d54e792
commit 53ff709
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;