X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fhpet.c;h=ba390d731175a492686643dd873786eafda9521b;hb=772320e84588dcbe1600ffb83e5f328f2209ac2a;hp=a198b7c87a123d2f80c6313261e9b80e8346cad1;hpb=1756ac3d3c41341297ea25b818b7fce505bb2a9a;p=deliverable%2Flinux.git

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index a198b7c87a12..ba390d731175 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -964,7 +964,7 @@ fs_initcall(hpet_late_init);
 
 void hpet_disable(void)
 {
-	if (is_hpet_capable()) {
+	if (is_hpet_capable() && hpet_virt_address) {
 		unsigned int cfg = hpet_readl(HPET_CFG);
 
 		if (hpet_legacy_int_enabled) {