From c562a59fa9a6ad7a4f08ff3f054932406394cc07 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Fri, 24 Jul 2009 15:08:11 +0200
Subject: [PATCH] --- yaml --- r: 165516 b: refs/heads/master c:
 b0525b48f06714e8d5cf6a3266261b71de8d6dd4 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/power/ds2760_battery.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 79bbd509e148..cd1e1193fe9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a8af0d31cfa6c728a68c00f6b1b518e2dcc03d
+refs/heads/master: b0525b48f06714e8d5cf6a3266261b71de8d6dd4
diff --git a/trunk/drivers/power/ds2760_battery.c b/trunk/drivers/power/ds2760_battery.c
index 1bb8498f14be..6f1dba5a519d 100644
--- a/trunk/drivers/power/ds2760_battery.c
+++ b/trunk/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;