aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorMartin Bergstrom <martin.bergstrom@stericsson.com>2012-06-08 10:21:48 -0400
committerLee Jones <lee.jones@linaro.org>2013-03-06 23:35:36 -0500
commite82c5bdbf3aa26d22e9eab3626213795d8338da1 (patch)
treeec8ab52138f70445ee76f721cf256aca9da82dbd /drivers/power
parent93ff722e88530b9719cbf53be4f3197722461394 (diff)
ab8500-fg: Report unscaled capacity
Unscaled capacity should be reported for POWER_SUPPLY_PROP_CAPACITY. Signed-off-by: Martin Bergstrom <martin.bergstrom@stericsson.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ab8500_fg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index 92f342bcf188..a747c5ce3b27 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2153,9 +2153,7 @@ static int ab8500_fg_get_property(struct power_supply *psy,
2153 val->intval = di->bat_cap.prev_mah; 2153 val->intval = di->bat_cap.prev_mah;
2154 break; 2154 break;
2155 case POWER_SUPPLY_PROP_CAPACITY: 2155 case POWER_SUPPLY_PROP_CAPACITY:
2156 if (di->bm->capacity_scaling) 2156 if (di->flags.batt_unknown && !di->bm->chg_unknown_bat &&
2157 val->intval = di->bat_cap.cap_scale.scaled_cap;
2158 else if (di->flags.batt_unknown && !di->bm->chg_unknown_bat &&
2159 di->flags.batt_id_received) 2157 di->flags.batt_id_received)
2160 val->intval = 100; 2158 val->intval = 100;
2161 else 2159 else