From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 27 Mar 2007 07:08:26 +0000 (+0200)
Subject: [PATCH] i386: Fix bogus return value in hpet_next_event()
X-Git-Tag: v2.6.21-rc6~88
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7f6d15ff2664467a2cb669abcabb5ffaf719b2d;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index f3ab61ee749..76afea67f69 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;
 }
 
 /*