diff options
author | Amol Lad <amol@verismonetworks.com> | 2006-12-06 20:14:02 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:02 -0500 |
commit | c0e84b9901c0924e2503c0aab3772a4469ba4aef (patch) | |
tree | afef55a9d10195f1aeb84b708112aad5e465c97a | |
parent | 399287229c775a8962a852a761d65dc9475dec7c (diff) |
[PATCH] i386: Add iounmap in error paths in hpet code
Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/kernel/time_hpet.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c index 1a2a979cf6a3..1e4702dfcd01 100644 --- a/arch/i386/kernel/time_hpet.c +++ b/arch/i386/kernel/time_hpet.c | |||
@@ -132,14 +132,20 @@ int __init hpet_enable(void) | |||
132 | * the single HPET timer for system time. | 132 | * the single HPET timer for system time. |
133 | */ | 133 | */ |
134 | #ifdef CONFIG_HPET_EMULATE_RTC | 134 | #ifdef CONFIG_HPET_EMULATE_RTC |
135 | if (!(id & HPET_ID_NUMBER)) | 135 | if (!(id & HPET_ID_NUMBER)) { |
136 | iounmap(hpet_virt_address); | ||
137 | hpet_virt_address = NULL; | ||
136 | return -1; | 138 | return -1; |
139 | } | ||
137 | #endif | 140 | #endif |
138 | 141 | ||
139 | 142 | ||
140 | hpet_period = hpet_readl(HPET_PERIOD); | 143 | hpet_period = hpet_readl(HPET_PERIOD); |
141 | if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) | 144 | if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) { |
145 | iounmap(hpet_virt_address); | ||
146 | hpet_virt_address = NULL; | ||
142 | return -1; | 147 | return -1; |
148 | } | ||
143 | 149 | ||
144 | /* | 150 | /* |
145 | * 64 bit math | 151 | * 64 bit math |
@@ -156,8 +162,11 @@ int __init hpet_enable(void) | |||
156 | 162 | ||
157 | hpet_use_timer = id & HPET_ID_LEGSUP; | 163 | hpet_use_timer = id & HPET_ID_LEGSUP; |
158 | 164 | ||
159 | if (hpet_timer_stop_set_go(hpet_tick)) | 165 | if (hpet_timer_stop_set_go(hpet_tick)) { |
166 | iounmap(hpet_virt_address); | ||
167 | hpet_virt_address = NULL; | ||
160 | return -1; | 168 | return -1; |
169 | } | ||
161 | 170 | ||
162 | use_hpet = 1; | 171 | use_hpet = 1; |
163 | 172 | ||