summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2010-11-12 11:36:22 +0100
committerAnton Vorontsov <cbouatmailru@gmail.com>2010-11-18 16:56:15 +0300
commit86af95039b69a90db15294eb1f9c147f1df0a8ea (patch)
treeda3a54667bdea3e0d8eb7dea9322c0970d59b27d /drivers/power
parente53beacd23d9cb47590da6a7a7f6d417b941a994 (diff)
downloadop-kernel-dev-86af95039b69a90db15294eb1f9c147f1df0a8ea.zip
op-kernel-dev-86af95039b69a90db15294eb1f9c147f1df0a8ea.tar.gz
ds2760_battery: Fix calculation of time_to_empty_now
A check against division by zero was modified in commit b0525b48. Since this change time_to_empty_now is always reported as zero while the battery is discharging and as a negative value while the battery is charging. This is because current is negative while the battery is discharging. Fix the check introduced by commit b0525b48 so that time_to_empty_now is reported correctly during discharge and as zero while charging. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Acked-by: Daniel Mack <daniel@caiaq.de> Cc: stable@kernel.org [2.6.32..2.6.36] Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ds2760_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c
index b3c01c1..11e1ac5 100644
--- a/drivers/power/ds2760_battery.c
+++ b/drivers/power/ds2760_battery.c
@@ -212,7 +212,7 @@ static int ds2760_battery_read_status(struct ds2760_device_info *di)
if (di->rem_capacity > 100)
di->rem_capacity = 100;
- if (di->current_uA >= 100L)
+ if (di->current_uA < -100L)
di->life_sec = -((di->accum_current_uAh - di->empty_uAh) * 36L)
/ (di->current_uA / 100L);
else
OpenPOWER on IntegriCloud