---

yaml --- r: 118771 b: refs/heads/master c: 89d77a1 h: refs/heads/master i: 118769: a8633c0 118767: 9446297 v: v3
git-mirror · Nov 10, 2008 · 5f37a63 · 5f37a63
1 parent af502d3
commit 5f37a63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1de5b0854623d30d01d72cd4ea323eb5f39d1f16
+refs/heads/master: 89d77a1eb60be916d85d9394bedbfa2037af89c5
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/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;
 }