aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/time_hpet.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c
index 658c0629ba6a..23e81fcbeaea 100644
--- a/arch/i386/kernel/time_hpet.c
+++ b/arch/i386/kernel/time_hpet.c
@@ -319,8 +319,12 @@ static void hpet_rtc_timer_reinit(void)
319{ 319{
320 unsigned int cfg, cnt; 320 unsigned int cfg, cnt;
321 321
322 if (!(PIE_on | AIE_on | UIE_on)) 322 if (unlikely(!(PIE_on | AIE_on | UIE_on))) {
323 cfg = hpet_readl(HPET_T1_CFG);
324 cfg &= ~HPET_TN_ENABLE;
325 hpet_writel(cfg, HPET_T1_CFG);
323 return; 326 return;
327 }
324 328
325 if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ)) 329 if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
326 hpet_rtc_int_freq = PIE_freq; 330 hpet_rtc_int_freq = PIE_freq;