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 | fa5cecd111d235819a1d807d43216ae459a0dd6f (patch) | |
tree | a6cfabad6e581ba2396a2660a3c2553baefce16f | |
parent | c0e84b9901c0924e2503c0aab3772a4469ba4aef (diff) |
[PATCH] i386: add missing iounmap in i386 hpet clocksource code
ioremap must be balanced by an iounmap and failing to do so can result
in a memory leak.
Tested (compilation only):
- using allmodconfig
- making sure the files are compiling without any warning/error due to
new changes
Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r-- | arch/i386/kernel/hpet.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index 17647a530b2f..45a8685bb60b 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c | |||
@@ -34,6 +34,7 @@ static int __init init_hpet_clocksource(void) | |||
34 | unsigned long hpet_period; | 34 | unsigned long hpet_period; |
35 | void __iomem* hpet_base; | 35 | void __iomem* hpet_base; |
36 | u64 tmp; | 36 | u64 tmp; |
37 | int err; | ||
37 | 38 | ||
38 | if (!is_hpet_enabled()) | 39 | if (!is_hpet_enabled()) |
39 | return -ENODEV; | 40 | return -ENODEV; |
@@ -61,7 +62,11 @@ static int __init init_hpet_clocksource(void) | |||
61 | do_div(tmp, FSEC_PER_NSEC); | 62 | do_div(tmp, FSEC_PER_NSEC); |
62 | clocksource_hpet.mult = (u32)tmp; | 63 | clocksource_hpet.mult = (u32)tmp; |
63 | 64 | ||
64 | return clocksource_register(&clocksource_hpet); | 65 | err = clocksource_register(&clocksource_hpet); |
66 | if (err) | ||
67 | iounmap(hpet_base); | ||
68 | |||
69 | return err; | ||
65 | } | 70 | } |
66 | 71 | ||
67 | module_init(init_hpet_clocksource); | 72 | module_init(init_hpet_clocksource); |