| From 90d26504fd645454c7855b22e67b61cbc31b4c5c Mon Sep 17 00:00:00 2001 |
| From: Sven Neumann <s.neumann@raumfeld.com> |
| Date: Fri, 12 Nov 2010 11:36:22 +0100 |
| Subject: [PATCH] ds2760_battery: Fix calculation of time_to_empty_now |
| |
| commit 86af95039b69a90db15294eb1f9c147f1df0a8ea upstream. |
| |
| 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> |
| Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c |
| index 3bf8d1f..4e13ebd 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 |
| -- |
| 1.7.4.4 |
| |
