aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Pizunski <linus@narrativeteam.com>2013-12-12 17:12:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-12 18:19:26 -0800
commiteb3c227289840eed95ddfb0516046f08d8993940 (patch)
tree27121b7d09bf85b682ab373c293e0553844adbf5
parentprocfs: also fix proc_reg_get_unmapped_area() for !MMU case (diff)
downloadlinux-dev-eb3c227289840eed95ddfb0516046f08d8993940.tar.xz
linux-dev-eb3c227289840eed95ddfb0516046f08d8993940.zip
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
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> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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 c0da95e95702..3281c90691c3 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -220,6 +220,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;