summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-12-09 09:39:15 +1100
committerJohn Stultz <john.stultz@linaro.org>2012-01-26 19:41:36 -0800
commit5f9679d29c7959445d4af1eb85ee55e4ebad4a93 (patch)
tree19ba795822c8f1cb3d2c3e8af1dd827600ac1e86 /drivers/rtc
parentbd729d72b428261f2975360e0c117d7d7a2cd6e8 (diff)
downloadlinux-3.10-5f9679d29c7959445d4af1eb85ee55e4ebad4a93.tar.gz
linux-3.10-5f9679d29c7959445d4af1eb85ee55e4ebad4a93.tar.bz2
linux-3.10-5f9679d29c7959445d4af1eb85ee55e4ebad4a93.zip
rtc: Expire alarms after the time is set. (v2)
If the alarm time programming in the rtc is ever in the past, it won't fire, and any other alarm will be queued after it so they won't fire either. So any time that the alarm might be in the past, we need to trigger the irq handler to ensure the old alarm is cleared and the timer queue is fully in the future. This is done whenever the RTC clock is set. This is the second revision of this patch, which was earlier reverted. This version avoids the initialization problem, which is handled by a different patch. Tested-by: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: NeilBrown <neilb@suse.de> [Remove problematic initialization change, update commit log, also catch set_mmss case -jstultz] Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/interface.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index c55a16041b6..167e68a9ffd 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -73,6 +73,8 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
err = -EINVAL;
mutex_unlock(&rtc->ops_lock);
+ /* A timer might have just expired */
+ schedule_work(&rtc->irqwork);
return err;
}
EXPORT_SYMBOL_GPL(rtc_set_time);
@@ -112,6 +114,8 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
err = -EINVAL;
mutex_unlock(&rtc->ops_lock);
+ /* A timer might have just expired */
+ schedule_work(&rtc->irqwork);
return err;
}