diff options
author | Jan Beulich <JBeulich@suse.com> | 2012-05-25 06:40:09 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-25 09:32:29 -0400 |
commit | 1b38a3a10f2ad96a3c0130f63b7f3610bab7090d (patch) | |
tree | a962f72829577b5c32d47635d98a53dc0a5c353e /arch/x86/kernel | |
parent | ce004178be1bbaa292e9e6497939e2970300095a (diff) |
x86: hpet: Fix copy-and-paste mistake in earlier change
This fixes an oversight in 396e2c6fed4ff13b53ce0e573105531cf53b0cad
("x86: Clear HPET configuration registers on startup"), noticed by
Thomas Gleixner.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4FBF7DA902000078000861EE@nat28.tlf.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-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 9cc7b4392f7c..1460a5df92f7 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -870,7 +870,7 @@ int __init hpet_enable(void) | |||
870 | else | 870 | else |
871 | pr_warn("HPET initial state will not be saved\n"); | 871 | pr_warn("HPET initial state will not be saved\n"); |
872 | cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY); | 872 | cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY); |
873 | hpet_writel(cfg, HPET_Tn_CFG(i)); | 873 | hpet_writel(cfg, HPET_CFG); |
874 | if (cfg) | 874 | if (cfg) |
875 | pr_warn("HPET: Unrecognized bits %#x set in global cfg\n", | 875 | pr_warn("HPET: Unrecognized bits %#x set in global cfg\n", |
876 | cfg); | 876 | cfg); |