Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / power / apm_power.c

diff --git a/drivers/power/apm_power.c b/drivers/power/apm_power.c
index a832a9a05c66e8f469340978c52ad4db36c2ce08..a4892275659dc02ffb1d12b85d0774a86bda8b08 100644 (file)
--- a/drivers/power/apm_power.c
+++ b/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;