Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43010
b: refs/heads/master
c: c0e84b9
h: refs/heads/master
v: v3
  • Loading branch information
Amol Lad authored and Andi Kleen committed Dec 7, 2006
1 parent 46b4913 commit 286dfb2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 399287229c775a8962a852a761d65dc9475dec7c
refs/heads/master: c0e84b9901c0924e2503c0aab3772a4469ba4aef
15 changes: 12 additions & 3 deletions trunk/arch/i386/kernel/time_hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,20 @@ int __init hpet_enable(void)
* the single HPET timer for system time.
*/
#ifdef CONFIG_HPET_EMULATE_RTC
if (!(id & HPET_ID_NUMBER))
if (!(id & HPET_ID_NUMBER)) {
iounmap(hpet_virt_address);
hpet_virt_address = NULL;
return -1;
}
#endif


hpet_period = hpet_readl(HPET_PERIOD);
if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD)) {
iounmap(hpet_virt_address);
hpet_virt_address = NULL;
return -1;
}

/*
* 64 bit math
Expand All @@ -156,8 +162,11 @@ int __init hpet_enable(void)

hpet_use_timer = id & HPET_ID_LEGSUP;

if (hpet_timer_stop_set_go(hpet_tick))
if (hpet_timer_stop_set_go(hpet_tick)) {
iounmap(hpet_virt_address);
hpet_virt_address = NULL;
return -1;
}

use_hpet = 1;

Expand Down

0 comments on commit 286dfb2

Please sign in to comment.