patch-2.4.17 linux/drivers/char/rtc.c

• Lines: 18
• Date: Fri Dec 21 16:40:32 2001
• Orig file: linux-2.4.16/drivers/char/rtc.c
• Orig date: Tue Nov 13 17:16:05 2001

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -785,6 +785,9 @@
 		printk(KERN_INFO "rtc: %s epoch (%lu) detected\n", guess, epoch);
 #endif
 #if RTC_IRQ
+	if (rtc_has_irq == 0)
+		goto no_irq2;
+
 	init_timer(&rtc_irq_timer);
 	rtc_irq_timer.function = rtc_dropped_irq;
 	spin_lock_irq(&rtc_lock);
@@ -792,6 +795,7 @@
 	CMOS_WRITE(((CMOS_READ(RTC_FREQ_SELECT) & 0xF0) | 0x06), RTC_FREQ_SELECT);
 	spin_unlock_irq(&rtc_lock);
 	rtc_freq = 1024;
+no_irq2:
 #endif
 
 	printk(KERN_INFO "Real Time Clock Driver v" RTC_VERSION "\n");