---

yaml --- r: 232935 b: refs/heads/master c: 55835eb h: refs/heads/master i: 232933: 6ab0fd8 232931: 516696d 232927: 4f91775 v: v3
git-mirror · Feb 6, 2011 · 1989b34 · 1989b34
1 parent 535c4f0
commit 1989b34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f266a5110d453b7987194460ac7edd31f1a5426c
+refs/heads/master: 55835eb62fad1253c9e657a667549945e4be9759
diff --git a/trunk/drivers/rtc/class.c b/trunk/drivers/rtc/class.c
@@ -143,6 +143,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 	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;

diff --git a/trunk/drivers/rtc/interface.c b/trunk/drivers/rtc/interface.c
@@ -464,6 +464,9 @@ int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)
 	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;