]> git.baikalelectronics.ru Git - kernel.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)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 23 Jul 2010 10:53:00 +0000 (12:53 +0200)
commit53234c945aeef975281bb8613a8b56b9038f147a
tree0e2f78629117a2ca1eff77c673ce364bb4cc32a6
parent08fd6386e5129061e818632eb505941c4f5ac53f
x86: Do not try to disable hpet if it hasn't been initialized before

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>
Cc: stable@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/hpet.c