summaryrefslogtreecommitdiff
path: root/drivers/input/keybdev.c
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@heisenberg.transvirtual.com>2002-07-07 22:56:15 -0700
committerJames Simmons <jsimmons@heisenberg.transvirtual.com>2002-07-07 22:56:15 -0700
commit8ef1bf6df837a5f92e2d8d50ca26c77998602ff4 (patch)
tree4b08ab0d040f739937b98081fae5cc7aa1b39c64 /drivers/input/keybdev.c
parentaf5c826ce279f0cf9f87ce7543e94b0d3b83a644 (diff)
parenta321a55fcbb2c21eb7bc8b7d4b294eefaea9065c (diff)
Merge http://fbdev.bkbits.net/fbdev-2.5
into heisenberg.transvirtual.com:/tmp/fbdev-2.5
Diffstat (limited to 'drivers/input/keybdev.c')
-rw-r--r--drivers/input/keybdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keybdev.c b/drivers/input/keybdev.c
index 6731dd2542c2..8a5a93b57f7a 100644
--- a/drivers/input/keybdev.c
+++ b/drivers/input/keybdev.c
@@ -1,5 +1,5 @@
/*
- * $Id: keybdev.c,v 1.16 2002/01/09 04:21:41 lethal Exp $
+ * $Id: keybdev.c,v 1.19 2002/03/13 10:09:20 vojtech Exp $
*
* Copyright (c) 1999-2001 Vojtech Pavlik
*
@@ -179,7 +179,7 @@ void panic_blink(void)
static unsigned long last_jiffie;
static char led;
/* Roughly 1/2s frequency. KDB uses about 1s. Make sure it is different. */
- if (jiffies - last_jiffie > HZ/2) {
+ if (time_after(jiffies, last_jiffie + HZ/2)) {
led ^= 0x01 | 0x04;
keybdev_ledfunc(led);
last_jiffie = jiffies;