]> git.karo-electronics.de Git - karo-tx-linux.git/commit
x86: Do not try to disable hpet if it hasn't been initialized before
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 21 Jul 2010 17:32:37 +0000 (18:32 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 2 Aug 2010 17:21:03 +0000 (10:21 -0700)
commit2d336114ea3e849673b1d61faef6e15688ea59b6
tree797ce7fab2c54545625fea62ff62fd8227545e76
parent75062391eb118b83528ff549d48f067e7d06aff7
x86: Do not try to disable hpet if it hasn't been initialized before

commit ff4878089e1eaeac79d57878ad4ea32910fb4037 upstream.

hpet_disable is called unconditionally on machine reboot if hpet support
is compiled in the kernel.
hpet_disable only checks if the machine is hpet capable but doesn't make
sure that hpet has been initialized.

[ tglx: Made it a one liner and removed the redundant hpet_address check ]

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Venkatesh Pallipadi <venki@google.com>
LKML-Reference: <alpine.DEB.2.00.1007211726240.22235@kaball-desktop>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/hpet.c