]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Dec 2013 18:44:34 +0000 (10:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Dec 2013 18:44:34 +0000 (10:44 -0800)
added patches:
drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch

queue-3.4/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch [new file with mode: 0644]
queue-3.4/series

diff --git a/queue-3.4/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch b/queue-3.4/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch
new file mode 100644 (file)
index 0000000..5545c70
--- /dev/null
@@ -0,0 +1,33 @@
+From eb3c227289840eed95ddfb0516046f08d8993940 Mon Sep 17 00:00:00 2001
+From: Linus Pizunski <linus@narrativeteam.com>
+Date: Thu, 12 Dec 2013 17:12:23 -0800
+Subject: drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
+
+From: Linus Pizunski <linus@narrativeteam.com>
+
+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>
+
+---
+ drivers/rtc/rtc-at91rm9200.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/rtc/rtc-at91rm9200.c
++++ b/drivers/rtc/rtc-at91rm9200.c
+@@ -162,6 +162,8 @@ static int at91_rtc_setalarm(struct devi
+       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;
index 44070cc899c51a277a300caf6f4ddebae4c891bd..5fa9b30687a211b85b743469085b42581c674eee 100644 (file)
@@ -14,3 +14,4 @@ usb-gadget-composite-reset-delayed_status-on-reset_config.patch
 usb-serial-option-blacklist-interface-1-for-huawei-e173s-6.patch
 usb-option-support-new-huawei-devices.patch
 input-usbtouchscreen-separate-report-and-transmit-buffer-size-handling.patch
+drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch