From e82c5bdbf3aa26d22e9eab3626213795d8338da1 Mon Sep 17 00:00:00 2001 From: Martin Bergstrom Date: Fri, 8 Jun 2012 16:21:48 +0200 Subject: ab8500-fg: Report unscaled capacity Unscaled capacity should be reported for POWER_SUPPLY_PROP_CAPACITY. Signed-off-by: Martin Bergstrom Signed-off-by: Lee Jones Reviewed-by: Marcus COOPER Tested-by: Jonas ABERG --- drivers/power/ab8500_fg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/power') diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 92f342bcf18..a747c5ce3b2 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 -- cgit v1.2.3