---

yaml --- r: 123232 b: refs/heads/master c: 39c04b5 h: refs/heads/master v: v3
git-mirror · Dec 16, 2008 · 0faf0e1 · 0faf0e1
1 parent d0efed4
commit 0faf0e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bacbe9994541c70aa3abd1a013ac738e58d4bfb2
+refs/heads/master: 39c04b55240342d0742ac48538d3d8c71bfc0a94
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
@@ -834,10 +834,11 @@ static __init int hpet_late_init(void)
 
 		hpet_address = force_hpet_address;
 		hpet_enable();
-		if (!hpet_virt_address)
-			return -ENODEV;
 	}
 
+	if (!hpet_virt_address)
+		return -ENODEV;
+
 	hpet_reserve_platform_timers(hpet_readl(HPET_ID));
 
 	for_each_online_cpu(cpu) {