1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index c07ffa5a0501..8d85cf385e09 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -748,9 +748,23 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_freq);
  */
 static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer)
 {
+        struct timerqueue_node *next = timerqueue_getnext(&rtc->timerqueue);
+        struct rtc_time tm;
+        ktime_t now;
+
         timer->enabled = 1;
+        __rtc_read_time(rtc, &tm);
+        now = rtc_tm_to_ktime(tm);
+
+        /* Skip over expired timers */
+        while (next) {
+                if (next->expires.tv64 >= now.tv64)
+                        break;
+                next = timerqueue_iterate_next(next);
+        }
+
         timerqueue_add(&rtc->timerqueue, &timer->node);
-        if (&timer->node == timerqueue_getnext(&rtc->timerqueue)) {
+        if (!next) {
                 struct rtc_wkalrm alarm;
                 int err;
                 alarm.time = rtc_ktime_to_tm(timer->node.expires);