---

yaml --- r: 350636 b: refs/heads/master c: d80108f h: refs/heads/master v: v3
git-mirror · Jan 23, 2013 · cc6ae2b · cc6ae2b
1 parent e5133f5
commit cc6ae2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3edebfcdb31e6203abe0994c1e785833d928e8b4
+refs/heads/master: d80108fc69484c20c3b85d7cdc948e191e843fa4
diff --git a/trunk/drivers/power/abx500_chargalg.c b/trunk/drivers/power/abx500_chargalg.c
@@ -1628,6 +1628,9 @@ static int abx500_chargalg_get_property(struct power_supply *psy,
 				val->intval = POWER_SUPPLY_HEALTH_COLD;
 			else
 				val->intval = POWER_SUPPLY_HEALTH_OVERHEAT;
+		} else if (di->charge_state == STATE_SAFETY_TIMER_EXPIRED ||
+			   di->charge_state == STATE_SAFETY_TIMER_EXPIRED_INIT) {
+			val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
 		} else {
 			val->intval = POWER_SUPPLY_HEALTH_GOOD;
 		}