summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-03-27 09:08:26 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 09:08:08 -0700
commitc7f6d15ff2664467a2cb669abcabb5ffaf719b2d (patch)
tree6e397d5bb2afcc747d85e9c2aedcb8a6cdf08394 /arch
parente0ab0bb6d2b77917f4c31f157b2690602a5608f9 (diff)
downloadlinux-c7f6d15ff2664467a2cb669abcabb5ffaf719b2d.tar.bz2
[PATCH] i386: Fix bogus return value in hpet_next_event()
The clockevents / tick management code expects an error value, when the event is already expired. hpet_next_event() returns 1 in that case. Fix it to return the proper -ETIME error code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/hpet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index f3ab61ee7498..76afea67f691 100644
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
@@ -197,7 +197,7 @@ static int hpet_next_event(unsigned long delta,
cnt += delta;
hpet_writel(cnt, HPET_T0_CMP);
- return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0);
+ return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0) ? -ETIME : 0;
}
/*