Commit c7f6d15f authored Mar 27, 2007 by Thomas Gleixner Committed by Linus Torvalds Mar 27, 2007

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

parent e0ab0bb6

arch/i386/kernel/hpet.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

		/*