diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-07-24 15:08:11 +0200 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-04 20:26:40 +0400 |
| commit | b0525b48f06714e8d5cf6a3266261b71de8d6dd4 (patch) | |
| tree | faef8c88f77b5d1738feb8a57ef154832b764883 /drivers | |
| parent | 83a8af0d31cfa6c728a68c00f6b1b518e2dcc03d (diff) | |
| download | kernel-crypto-b0525b48f06714e8d5cf6a3266261b71de8d6dd4.tar.gz kernel-crypto-b0525b48f06714e8d5cf6a3266261b71de8d6dd4.tar.xz kernel-crypto-b0525b48f06714e8d5cf6a3266261b71de8d6dd4.zip | |
ds2760_battery: Fix integer overflow for time_to_empty_now
On the device we're currently developing, battery sizes of ~2.8Ah and
current flow of ~600mA are typical.
With that values, the life_sec computation overflows due to the
multiplication by 3600.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
Cc: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/ds2760_battery.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index 1bb8498f14b..6f1dba5a519 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c @@ -211,9 +211,9 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di) if (di->rem_capacity > 100) di->rem_capacity = 100; - if (di->current_uA) - di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * - 3600L) / di->current_uA; + if (di->current_uA >= 100L) + di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * 36L) + / (di->current_uA / 100L); else di->life_sec = 0; |