diff options
| -rw-r--r-- | drivers/acpi/battery.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 4fb3c12ac1d8..1423b0c0cd2e 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -173,19 +173,7 @@ static int acpi_battery_get_property(struct power_supply *psy, | |||
| 173 | val->intval = battery->voltage_now * 1000; | 173 | val->intval = battery->voltage_now * 1000; |
| 174 | break; | 174 | break; |
| 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: | 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: |
| 176 | val->intval = battery->current_now; | 176 | val->intval = battery->current_now * 1000; |
| 177 | if (battery->power_unit) { | ||
| 178 | val->intval *= 1000; | ||
| 179 | } else { | ||
| 180 | /* | ||
| 181 | * If power units are mW, convert to mA by dividing by | ||
| 182 | * current voltage. | ||
| 183 | */ | ||
| 184 | if (battery->voltage_now) | ||
| 185 | val->intval /= battery->voltage_now; | ||
| 186 | else | ||
| 187 | val->intval = -1; | ||
| 188 | } | ||
| 189 | break; | 177 | break; |
| 190 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: | 178 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: |
| 191 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: | 179 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: |
