From ff22fd7d2b4ae937e8e42481d2fea4b6ed51e9b3 Mon Sep 17 00:00:00 2001 From: Martin Bergstrom Date: Fri, 8 Jun 2012 16:21:48 +0200 Subject: [PATCH] --- yaml --- r: 367457 b: refs/heads/master c: e82c5bdbf3aa26d22e9eab3626213795d8338da1 h: refs/heads/master i: 367455: ad732e7e434bb49d9fc43f1c989308ebe8144b72 v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_fg.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a6356352ff8f..99a3fad3584a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93ff722e88530b9719cbf53be4f3197722461394 +refs/heads/master: e82c5bdbf3aa26d22e9eab3626213795d8338da1 diff --git a/trunk/drivers/power/ab8500_fg.c b/trunk/drivers/power/ab8500_fg.c index 92f342bcf188..a747c5ce3b27 100644 --- a/trunk/drivers/power/ab8500_fg.c +++ b/trunk/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