diff --git a/[refs] b/[refs]
index 97ada92b63a3..7a13b3b3c546 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae4bb152901e406074ae2a205e1c42941a46bbaf
+refs/heads/master: e91926e9ea9073d8ce95b74602e8c2d775f5a793
diff --git a/trunk/drivers/power/apm_power.c b/trunk/drivers/power/apm_power.c
index a832a9a05c66..a4892275659d 100644
--- a/trunk/drivers/power/apm_power.c
+++ b/trunk/drivers/power/apm_power.c
@@ -133,6 +133,9 @@ static int do_calculate_time(int status, enum apm_source source)
 			return -1;
 	}
 
+	if (!I.intval)
+		return 0;
+
 	switch (source) {
 	case SOURCE_CHARGE:
 		full_prop = POWER_SUPPLY_PROP_CHARGE_FULL;