From 188118bb67958e1d58cb5be415313de884b60ae8 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 14 Mar 2012 03:00:01 +0100 Subject: [PATCH] --- yaml --- r: 297961 b: refs/heads/master c: 6e0e60cd0d688d0d1af85ef2abb8e363595af988 h: refs/heads/master i: 297959: a088442cac9f44abb7abb87b21f16c045031438c v: v3 --- [refs] | 2 +- trunk/drivers/power/max17042_battery.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a43f87932a81..42c1768a1a32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3124c4a080f9263abb667a827d30c9e81c9e5a21 +refs/heads/master: 6e0e60cd0d688d0d1af85ef2abb8e363595af988 diff --git a/trunk/drivers/power/max17042_battery.c b/trunk/drivers/power/max17042_battery.c index 5474e76d36fb..d576912b1219 100644 --- a/trunk/drivers/power/max17042_battery.c +++ b/trunk/drivers/power/max17042_battery.c @@ -179,14 +179,11 @@ static int max17042_get_property(struct power_supply *psy, val->intval = ret >> 8; break; case POWER_SUPPLY_PROP_CHARGE_FULL: - ret = max17042_read_reg(chip->client, MAX17042_RepSOC); + ret = max17042_read_reg(chip->client, MAX17042_FullCAP); if (ret < 0) return ret; - if ((ret >> 8) >= MAX17042_BATTERY_FULL) - val->intval = 1; - else if (ret >= 0) - val->intval = 0; + val->intval = ret * 1000 / 2; break; case POWER_SUPPLY_PROP_TEMP: ret = max17042_read_reg(chip->client, MAX17042_TEMP);