From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 18:44:34 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.4.75~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bce669b0fb42b0837411d8052b33045f50e5ec70;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch --- 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 index 00000000000..5545c70102a --- /dev/null +++ b/queue-3.4/drivers-rtc-rtc-at91rm9200.c-correct-alarm-over-day-month-wrap.patch @@ -0,0 +1,33 @@ +From eb3c227289840eed95ddfb0516046f08d8993940 Mon Sep 17 00:00:00 2001 +From: Linus Pizunski +Date: Thu, 12 Dec 2013 17:12:23 -0800 +Subject: drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap + +From: Linus Pizunski + +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 +Signed-off-by: Nicolas Ferre +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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; diff --git a/queue-3.4/series b/queue-3.4/series index 44070cc899c..5fa9b30687a 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -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