diff options
| author | Martin Bergstrom <martin.bergstrom@stericsson.com> | 2012-06-08 16:21:48 +0200 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2012-09-25 09:37:08 -0600 |
| commit | d6568f72953b2dae52095c260e8acff70e4f78b2 (patch) | |
| tree | 7ef3d8e37315ae133a9dcccb7dc563f7e3b95a26 /drivers/power | |
| parent | c2b4994ca39a6a670f25dbbe785241c3394a0024 (diff) | |
power: 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: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/ab8500_fg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index fde189af147b..c5732e7a927b 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -2159,9 +2159,7 @@ static int ab8500_fg_get_property(struct power_supply *psy, val->intval = di->bat_cap.prev_mah; break; case POWER_SUPPLY_PROP_CAPACITY: - if (di->bat->capacity_scaling) - val->intval = di->bat_cap.cap_scale.scaled_cap; - else if (di->flags.batt_unknown && !di->bat->chg_unknown_bat && + if (di->flags.batt_unknown && !di->bat->chg_unknown_bat && di->flags.batt_id_received) val->intval = 100; else @@ -2625,7 +2623,7 @@ static ssize_t ab8500_show_capacity(struct device *dev, if (di->bat->capacity_scaling) capacity = di->bat_cap.cap_scale.scaled_cap; else - capacity = DIV_ROUND_CLOSEST(di->bat_cap.permille, 10); + capacity = di->bat_cap.prev_percent; return scnprintf(buf, PAGE_SIZE, "%d\n", capacity); } |