aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apm_32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index e32f6c37db9b..2467df7eca0b 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -227,6 +227,7 @@
227#include <linux/dmi.h> 227#include <linux/dmi.h>
228#include <linux/suspend.h> 228#include <linux/suspend.h>
229#include <linux/kthread.h> 229#include <linux/kthread.h>
230#include <linux/jiffies.h>
230 231
231#include <asm/system.h> 232#include <asm/system.h>
232#include <asm/uaccess.h> 233#include <asm/uaccess.h>
@@ -1287,7 +1288,7 @@ static void check_events(void)
1287 "event 0x%02x\n", event); 1288 "event 0x%02x\n", event);
1288 } 1289 }
1289 if (ignore_bounce 1290 if (ignore_bounce
1290 && ((jiffies - last_resume) > bounce_interval)) 1291 && (time_after(jiffies, last_resume + bounce_interval)))
1291 ignore_bounce = 0; 1292 ignore_bounce = 0;
1292 1293
1293 switch (event) { 1294 switch (event) {