summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLinus Pizunski <linus@narrativeteam.com>2013-12-12 17:12:23 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-20 07:45:09 -0800
commit8de7e61bf3ea5eb5349c4bd1de196fa4d397caab (patch)
tree4c868f8321d42fb9b7adc6501043feb322e0355b /drivers/rtc
parent21261e510cfb5d807fb827b6c01330daa7e0c330 (diff)
downloadlinux-3.10-8de7e61bf3ea5eb5349c4bd1de196fa4d397caab.tar.gz
linux-3.10-8de7e61bf3ea5eb5349c4bd1de196fa4d397caab.tar.bz2
linux-3.10-8de7e61bf3ea5eb5349c4bd1de196fa4d397caab.zip
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
commit eb3c227289840eed95ddfb0516046f08d8993940 upstream. Update month and day of month to the alarm month/day instead of current day/month when setting the RTC alarm mask. Signed-off-by: Linus Pizunski <linus@narrativeteam.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-at91rm9200.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index f296f3f7db9..1237c2173c6 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -221,6 +221,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
at91_alarm_year = tm.tm_year;
+ tm.tm_mon = alrm->time.tm_mon;
+ tm.tm_mday = alrm->time.tm_mday;
tm.tm_hour = alrm->time.tm_hour;
tm.tm_min = alrm->time.tm_min;
tm.tm_sec = alrm->time.tm_sec;