Commit 53ff7095 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

drivers/power/pmu_battery.c

+2 −0
Original line number Diff line number Diff line
@@ -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;