---

yaml --- r: 367457 b: refs/heads/master c: e82c5bd h: refs/heads/master i: 367455: ad732e7 v: v3
git-mirror · Mar 7, 2013 · ff22fd7 · ff22fd7
1 parent bb54d24
commit ff22fd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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