From cc6ae2bd976d29eaa50fc398d8598590ea00c078 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 17 Jan 2013 13:49:45 +0000 Subject: [PATCH] --- yaml --- r: 350636 b: refs/heads/master c: d80108fc69484c20c3b85d7cdc948e191e843fa4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/abx500_chargalg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf73e2ec3c8b..57f5c0b29a42 100644 --- 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 index 830b2dd7ac6d..2463fa01d63f 100644 --- 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; }