diff options
Diffstat (limited to 'drivers/power/olpc_battery.c')
-rw-r--r-- | drivers/power/olpc_battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index 9dd1589733c2..32570af3c5c9 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #define EC_BAT_VOLTAGE 0x10 /* uint16_t, *9.76/32, mV */ | 20 | #define EC_BAT_VOLTAGE 0x10 /* uint16_t, *9.76/32, mV */ |
21 | #define EC_BAT_CURRENT 0x11 /* int16_t, *15.625/120, mA */ | 21 | #define EC_BAT_CURRENT 0x11 /* int16_t, *15.625/120, mA */ |
22 | #define EC_BAT_ACR 0x12 /* int16_t, *416.7, µAh */ | 22 | #define EC_BAT_ACR 0x12 /* int16_t, *6250/15, µAh */ |
23 | #define EC_BAT_TEMP 0x13 /* uint16_t, *100/256, °C */ | 23 | #define EC_BAT_TEMP 0x13 /* uint16_t, *100/256, °C */ |
24 | #define EC_AMB_TEMP 0x14 /* uint16_t, *100/256, °C */ | 24 | #define EC_AMB_TEMP 0x14 /* uint16_t, *100/256, °C */ |
25 | #define EC_BAT_STATUS 0x15 /* uint8_t, bitmask */ | 25 | #define EC_BAT_STATUS 0x15 /* uint8_t, bitmask */ |
@@ -295,7 +295,7 @@ static int olpc_bat_get_property(struct power_supply *psy, | |||
295 | return ret; | 295 | return ret; |
296 | 296 | ||
297 | ec_word = be16_to_cpu(ec_word); | 297 | ec_word = be16_to_cpu(ec_word); |
298 | val->intval = ec_word * 4167 / 10; | 298 | val->intval = ec_word * 6250 / 15; |
299 | break; | 299 | break; |
300 | case POWER_SUPPLY_PROP_SERIAL_NUMBER: | 300 | case POWER_SUPPLY_PROP_SERIAL_NUMBER: |
301 | ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8); | 301 | ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8); |