The patch titled Subject: drivers/rtc/rtc-twl.c: return correct RTC event from ISR has been added to the -mm tree. Its filename is drivers-rtc-rtc-twlc-return-correct-rtc-event-from-isr.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Venu Byravarasu <vbyravarasu@xxxxxxxxxx> Subject: drivers/rtc/rtc-twl.c: return correct RTC event from ISR Following changes are made as part of this change: 1. As TWL RTC supports periodic interrupt, the correct event should be RTC_PF instead of RTC_UF. 2. No need to initialize variable "events" to 0 & then OR it with the event values. Hence fixing it. Signed-off-by: Venu Byravarasu <vbyravarasu@xxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-twl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/rtc/rtc-twl.c~drivers-rtc-rtc-twlc-return-correct-rtc-event-from-isr drivers/rtc/rtc-twl.c --- a/drivers/rtc/rtc-twl.c~drivers-rtc-rtc-twlc-return-correct-rtc-event-from-isr +++ a/drivers/rtc/rtc-twl.c @@ -365,7 +365,7 @@ out: static irqreturn_t twl_rtc_interrupt(int irq, void *rtc) { - unsigned long events = 0; + unsigned long events; int ret = IRQ_NONE; int res; u8 rd_reg; @@ -380,9 +380,9 @@ static irqreturn_t twl_rtc_interrupt(int * by reading RTS_INTERRUPTS_REGISTER[IT_TIMER,IT_ALARM] */ if (rd_reg & BIT_RTC_STATUS_REG_ALARM_M) - events |= RTC_IRQF | RTC_AF; + events = RTC_IRQF | RTC_AF; else - events |= RTC_IRQF | RTC_UF; + events = RTC_IRQF | RTC_PF; res = twl_rtc_write_u8(BIT_RTC_STATUS_REG_ALARM_M, REG_RTC_STATUS_REG); _ Subject: Subject: drivers/rtc/rtc-twl.c: return correct RTC event from ISR Patches currently in -mm which might be from vbyravarasu@xxxxxxxxxx are drivers-rtc-rtc-twlc-optimize-irq-bit-access.patch drivers-rtc-rtc-twlc-enable-rtc-irrespective-of-its-prior-state.patch drivers-rtc-rtc-twlc-simplify-rtc-interrupt-clearing.patch drivers-rtc-rtc-twlc-return-correct-rtc-event-from-isr.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