diff options
| author | Matt Fleming <mjf@gentoo.org> | 2008-11-02 16:04:20 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@apollo.(none)> | 2008-11-10 17:38:07 +0100 |
| commit | 89d77a1eb60be916d85d9394bedbfa2037af89c5 (patch) | |
| tree | 43528edb4db6c57a19e903240872acfe160e8653 /arch | |
| parent | 1de5b0854623d30d01d72cd4ea323eb5f39d1f16 (diff) | |
| download | lwn-89d77a1eb60be916d85d9394bedbfa2037af89c5.tar.gz lwn-89d77a1eb60be916d85d9394bedbfa2037af89c5.zip | |
x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP
In hpet_next_event() we check that the value we just wrote to
HPET_Tn_CMP(timer) has reached the chip. Currently, we're checking that
the value we wrote to HPET_Tn_CMP(timer) is in HPET_T0_CMP, which, if
timer is anything other than timer 0, is likely to fail.
Signed-off-by: Matt Fleming <mjf@gentoo.org>
Cc: mingo@elte.hu
Cc: venkatesh.pallipadi@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index f10f9461a43d..cfe6aa56f71b 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -322,7 +322,7 @@ static int hpet_next_event(unsigned long delta, * what we wrote hit the chip before we compare it to the * counter. */ - WARN_ON_ONCE((u32)hpet_readl(HPET_T0_CMP) != cnt); + WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt); return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0; } |