| From | mathieu.poirier@linaro ... | Subject | [PATCH 35/57] power: ab8500_fg: Report unscaled capacity | Date | Tue, 25 Sep 2012 10:12:32 -0600 |
| |
From: Martin Bergstrom <martin.bergstrom@stericsson.com>
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> --- 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 fde189a..c5732e7 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); } -- 1.7.5.4
|