Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75d2f180 authored by Uli Luckas's avatar Uli Luckas Committed by Russell King
Browse files

[ARM] 3345/1: Fix interday RTC alarms 



Patch from Uli Luckas

This is a bugfix.

The comment in arch/arm/common/rtctime.c explains it:
* FIXME: for now, we just copy the alarm time because we're lazy (and
* is therefore buggy - setting a 10am alarm at 8pm will not result in
* the alarm triggering.)

This patch adds one day to the alarm iff the alarm wrapped beyond midnight and therefore appears to be in the past.

Signed-off-by: default avatarUli Luckas <u.luckas@road-gmbh.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bc66d449

arch/arm/common/rtctime.c

+12 −4
Original line number Diff line number Diff line
@@ -128,19 +128,27 @@ EXPORT_SYMBOL(rtc_tm_to_time); 
/*

 * Calculate the next alarm time given the requested alarm time mask

 * and the current time.

 *

 * FIXME: for now, we just copy the alarm time because we're lazy (and

 * is therefore buggy - setting a 10am alarm at 8pm will not result in

 * the alarm triggering.)

 */

void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc_time *alrm)

{

	unsigned long next_time;

	unsigned long now_time;



	next->tm_year = now->tm_year;

	next->tm_mon = now->tm_mon;

	next->tm_mday = now->tm_mday;

	next->tm_hour = alrm->tm_hour;

	next->tm_min = alrm->tm_min;

	next->tm_sec = alrm->tm_sec;



	rtc_tm_to_time(now, &now_time);

	rtc_tm_to_time(next, &next_time);



	if (next_time < now_time) {

		/* Advance one day */

		next_time += 60 * 60 * 24;

		rtc_time_to_tm(next_time, next);

	}

}



static inline int rtc_read_time(struct rtc_ops *ops, struct rtc_time *tm)