diff options
| author | Martin Bergstrom <martin.bergstrom@stericsson.com> | 2012-06-08 16:21:48 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-03-07 12:35:36 +0800 |
| commit | e82c5bdbf3aa26d22e9eab3626213795d8338da1 (patch) | |
| tree | ec8ab52138f70445ee76f721cf256aca9da82dbd | |
| parent | 93ff722e88530b9719cbf53be4f3197722461394 (diff) | |
| download | blackbird-op-linux-e82c5bdbf3aa26d22e9eab3626213795d8338da1.tar.gz blackbird-op-linux-e82c5bdbf3aa26d22e9eab3626213795d8338da1.zip | |
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>
| -rw-r--r-- | drivers/power/ab8500_fg.c | 4 |
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, val->intval = di->bat_cap.prev_mah; break; case POWER_SUPPLY_PROP_CAPACITY: - if (di->bm->capacity_scaling) - val->intval = di->bat_cap.cap_scale.scaled_cap; - else if (di->flags.batt_unknown && !di->bm->chg_unknown_bat && + if (di->flags.batt_unknown && !di->bm->chg_unknown_bat && di->flags.batt_id_received) val->intval = 100; else |
