---

yaml --- r: 119345 b: refs/heads/master c: 558073d h: refs/heads/master i: 119343: f0851ba v: v3
git-mirror · Nov 26, 2008 · a901f47 · a901f47
1 parent d0db828
commit a901f47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4d469228a92a00e412675817cedd60133de38a
+refs/heads/master: 558073dd56707864f09d563b64e7c37c021e89d2
diff --git a/trunk/drivers/acpi/battery.c b/trunk/drivers/acpi/battery.c
@@ -174,6 +174,15 @@ static int acpi_battery_get_property(struct power_supply *psy,
 		break;
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
 		val->intval = battery->current_now * 1000;
+		/* if power units are mW, convert to mA by
+		   dividing by current voltage (mV/1000) */
+		if (!battery->power_unit) {
+			if (battery->voltage_now) {
+				val->intval /= battery->voltage_now;
+				val->intval *= 1000;
+			} else
+				val->intval = -1;
+		}
 		break;
 	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: