---

yaml --- r: 43011 b: refs/heads/master c: fa5cecd h: refs/heads/master i: 43009: 46b4913 43007: 23e9d19 v: v3
git-mirror · Dec 7, 2006 · 033fe60 · 033fe60
1 parent 286dfb2
commit 033fe60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e84b9901c0924e2503c0aab3772a4469ba4aef
+refs/heads/master: fa5cecd111d235819a1d807d43216ae459a0dd6f
diff --git a/trunk/arch/i386/kernel/hpet.c b/trunk/arch/i386/kernel/hpet.c
@@ -34,6 +34,7 @@ static int __init init_hpet_clocksource(void)
 	unsigned long hpet_period;
 	void __iomem* hpet_base;
 	u64 tmp;
+	int err;
 
 	if (!is_hpet_enabled())
 		return -ENODEV;
@@ -61,7 +62,11 @@ static int __init init_hpet_clocksource(void)
 	do_div(tmp, FSEC_PER_NSEC);
 	clocksource_hpet.mult = (u32)tmp;
 
-	return clocksource_register(&clocksource_hpet);
+	err = clocksource_register(&clocksource_hpet);
+	if (err)
+		iounmap(hpet_base);
+
+	return err;
 }
 
 module_init(init_hpet_clocksource);