From 033fe60c7f18d4a882c3ed780ce4192715f3bee6 Mon Sep 17 00:00:00 2001
From: Amol Lad <amol@verismonetworks.com>
Date: Thu, 7 Dec 2006 02:14:02 +0100
Subject: [PATCH] --- yaml --- r: 43011 b: refs/heads/master c:
 fa5cecd111d235819a1d807d43216ae459a0dd6f h: refs/heads/master i:   43009:
 46b49130ad13f9d2846dcc1f9bdb5496ced5bc66   43007:
 23e9d19e58e5378fbad97b428c0f4698af9d42e6 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/i386/kernel/hpet.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4edf8a33414..2bac62596269 100644
--- 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
index 17647a530b2f..45a8685bb60b 100644
--- 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);