diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2007-03-27 09:08:26 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 09:08:08 -0700 |
| commit | c7f6d15ff2664467a2cb669abcabb5ffaf719b2d (patch) | |
| tree | 6e397d5bb2afcc747d85e9c2aedcb8a6cdf08394 /arch/i386/kernel/hpet.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block (diff) | |
| download | linux-dev-c7f6d15ff2664467a2cb669abcabb5ffaf719b2d.tar.xz linux-dev-c7f6d15ff2664467a2cb669abcabb5ffaf719b2d.zip | |
[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/i386/kernel/hpet.c')
| -rw-r--r-- | arch/i386/kernel/hpet.c | 2 |
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; } /* |