commit 55835eb62fad1253c9e657a667549945e4be9759
author Ingo Molnar <mingo@elte.hu> Sun Feb 06 12:59:22 2011 +0100
committer Ingo Molnar <mingo@elte.hu> Sun Feb 06 12:59:38 2011 +0100
tree 21626f8fe39d917a955f1f5110d63e4765a3ec93
parent 83a06bf50bdf2074b9404951ff60e142d159d93b
parent f266a5110d453b7987194460ac7edd31f1a5426c

Merge branch 'timers/locking'

drivers/rtc/class.c

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 9583cbc..c404b61 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -143,6 +143,7 @@
 	rtc->id = id;
 	rtc->ops = ops;
 	rtc->owner = owner;
+	rtc->irq_freq = 1;
 	rtc->max_user_freq = 64;
 	rtc->dev.parent = dev;
 	rtc->dev.class = rtc_class;

drivers/rtc/interface.c

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 925006d..a0c0196 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -464,6 +464,9 @@
 	int err = 0;
 	unsigned long flags;
 
+	if (freq <= 0)
+		return -EINVAL;
+
 	spin_lock_irqsave(&rtc->irq_task_lock, flags);
 	if (rtc->irq_task != NULL && task == NULL)
 		err = -EBUSY;