From e382bac4010421c817b0894be39b0007cf49f98b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Dec 2008 13:30:03 -0800
Subject: [PATCH] --- yaml --- r: 119729 b: refs/heads/master c:
 f10a3a32ae2edbe94920ce6827f4c2550eb6ed48 h: refs/heads/master i:   119727:
 f8796a187ecd7ca50f25b4660aedd279eca4d6ab v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/acpi/battery.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 6d595731bdca..9709b98ea5ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e
+refs/heads/master: f10a3a32ae2edbe94920ce6827f4c2550eb6ed48
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
index 4fb3c12ac1d8..1423b0c0cd2e 100644
--- a/trunk/drivers/acpi/battery.c
+++ b/trunk/drivers/acpi/battery.c
@@ -173,19 +173,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
 		val->intval = battery->voltage_now * 1000;
 		break;
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
-		val->intval = battery->current_now;
-		if (battery->power_unit) {
-			val->intval *= 1000;
-		} else {
-			/*
-			 * If power units are mW, convert to mA by dividing by
-			 * current voltage.
-			 */
-			if (battery->voltage_now)
-				val->intval /= battery->voltage_now;
-			else
-				val->intval = -1;
-		}
+		val->intval = battery->current_now * 1000;
 		break;
 	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: