diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-09-28 13:53:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-25 14:22:15 +0100 |
| commit | 8e6e8ec18d95dc29058f707b218a658062550a4f (patch) | |
| tree | 14579152b57bebf547821112d3eeb9a8af3a0932 /drivers/rtc | |
| parent | 1e52ede8e1ed95aec3cd3acaea48066cb34c238b (diff) | |
| download | linux-stable-8e6e8ec18d95dc29058f707b218a658062550a4f.tar.gz linux-stable-8e6e8ec18d95dc29058f707b218a658062550a4f.tar.bz2 linux-stable-8e6e8ec18d95dc29058f707b218a658062550a4f.zip | |
rtc: set the alarm to the next expiring timer
[ Upstream commit 74717b28cb32e1ad3c1042cafd76b264c8c0f68d ]
If there is any non expired timer in the queue, the RTC alarm is never set.
This is an issue when adding a timer that expires before the next non
expired timer.
Ensure the RTC alarm is set in that case.
Fixes: 2b2f5ff00f63 ("rtc: interface: ignore expired timers when enqueuing new timers")
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 9bb934ed2a7a..dcfd3655ef0a 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -764,7 +764,7 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) } timerqueue_add(&rtc->timerqueue, &timer->node); - if (!next) { + if (!next || ktime_before(timer->node.expires, next->expires)) { struct rtc_wkalrm alarm; int err; alarm.time = rtc_ktime_to_tm(timer->node.expires); |