---

yaml --- r: 320504 b: refs/heads/master c: ecc2edd h: refs/heads/master v: v3
git-mirror · Jul 16, 2012 · 03f933f · 03f933f
1 parent 7fe240f
commit 03f933f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5619d0ba97cd336a100121cf8f2968c4b1f6c848
+refs/heads/master: ecc2edd56c49fa31a0a9ed15a7bf810ae79d3b85
diff --git a/trunk/drivers/power/olpc_battery.c b/trunk/drivers/power/olpc_battery.c
@@ -231,11 +231,9 @@ static int olpc_bat_get_charge_full_design(union power_supply_propval *val)
 
 	case POWER_SUPPLY_TECHNOLOGY_LiFe:
 		switch (mfr) {
-		case 1: /* Gold Peak */
-			val->intval = 2800000;
-			break;
+		case 1: /* Gold Peak, fall through */
 		case 2: /* BYD */
-			val->intval = 3100000;
+			val->intval = 2800000;
 			break;
 		default:
 			return -EIO;