From 4865f59f11971ce0cfa0cae001cc3826f316ba06 Mon Sep 17 00:00:00 2001 From: Venu Byravarasu Date: Fri, 23 Mar 2012 15:02:34 -0700 Subject: [PATCH] --- yaml --- r: 295243 b: refs/heads/master c: 2778ebcc09c002cccdbd6b5509b5cbf4161b486d h: refs/heads/master i: 295241: 7749d37959c26082141c05e70504ee5fa74f075d 295239: 7e92cb75cf9d95d1f3bb6fe65349eeaa06b73b5d v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-twl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aae9bf664caf..6d227f4ba91a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94a339d016e26f96a1bd9e08306c857825c91a66 +refs/heads/master: 2778ebcc09c002cccdbd6b5509b5cbf4161b486d diff --git a/trunk/drivers/rtc/rtc-twl.c b/trunk/drivers/rtc/rtc-twl.c index cedb6c145fc4..4c2c6df2a9ef 100644 --- a/trunk/drivers/rtc/rtc-twl.c +++ b/trunk/drivers/rtc/rtc-twl.c @@ -365,7 +365,7 @@ static int twl_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) 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 irq, void *rtc) * 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);