Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b38a3a1 authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

x86: hpet: Fix copy-and-paste mistake in earlier change 



This fixes an oversight in 396e2c6f
("x86: Clear HPET configuration registers on startup"), noticed by
Thomas Gleixner.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/4FBF7DA902000078000861EE@nat28.tlf.novell.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ce004178

arch/x86/kernel/hpet.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -870,7 +870,7 @@ int __init hpet_enable(void) 
	else

	else

		pr_warn("HPET initial state will not be saved\n");

		pr_warn("HPET initial state will not be saved\n");

	cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);

	cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);

	hpet_writel(cfg, HPET_Tn_CFG(i));

	hpet_writel(cfg, HPET_CFG);

	if (cfg)

	if (cfg)

		pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",

		pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",

			cfg);

			cfg);