The patch titled
rtc: pcf50633: consider alrm->enable in pcf50633_rtc_set_alarm
has been added to the -mm tree. Its filename is
rtc-pcf50633-consider-alrm-enable-in-pcf50633_rtc_set_alarm.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: rtc: pcf50633: consider alrm->enable in pcf50633_rtc_set_alarm
From: Werner Almesberger <werner@xxxxxxxxxxxx>
According to Documentation/rtc.txt, RTC_WKALM_SET sets the alarm time and
enables/disables the alarm. We implement RTC_WKALM_SET through
pcf50633_rtc_set_alarm. The enabling/disabling part was missing.
Signed-off-by: Werner Almesberger <werner@xxxxxxxxxxxx>
Reported-by: Michael 'Mickey' Lauer <mickey@xxxxxxxxxxxx>
Signed-off-by: Paul Fertser <fercerpav@xxxxxxxxx>
Cc: Paul Gortmaker <p_gortmaker@xxxxxxxxx>
Cc: Balaji Rao <balajirrao@xxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN drivers/rtc/rtc-pcf50633.c~rtc-pcf50633-consider-alrm-enable-in-pcf50633_rtc_set_alarm drivers/rtc/rtc-pcf50633.c
--- a/drivers/rtc/rtc-pcf50633.c~rtc-pcf50633-consider-alrm-enable-in-pcf50633_rtc_set_alarm
+++ a/drivers/rtc/rtc-pcf50633.c
@@ -245,8 +245,9 @@ static int pcf50633_rtc_set_alarm(struct
ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
PCF50633_TI_EXTENT, &pcf_tm.time[0]);
- if (!alarm_masked)
+ if (!alarm_masked || alrm->enabled)
pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
+ rtc->alarm_enabled = alrm->enabled;
return ret;
}
_
Patches currently in -mm which might be from werner@xxxxxxxxxxxx are
rtc-pcf50633-consider-alrm-enable-in-pcf50633_rtc_set_alarm.patch
rtc-pcf50633-manage-rtc-alarm-pending-flag.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
