Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Serialize EFI time accesses on rtc_lock
  x86: Serialize SMP bootup CMOS accesses on rtc_lock
  rtc: stmp3xxx: Remove UIE handlers
  rtc: stmp3xxx: Get rid of mach-specific accessors
  rtc: stmp3xxx: Initialize drvdata before registering device
  rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
  rtc: stmp3xxx: Restore register definitions
  rtc: vt8500: Use define instead of hardcoded value for status bit

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c
index efd6066b5cd..f93f412423c 100644
--- a/drivers/rtc/rtc-vt8500.c
+++ b/drivers/rtc/rtc-vt8500.c
@@ -74,6 +74,8 @@
 #define VT8500_RTC_CR_SM_SEC    (1 << 3)        /* 0: 1Hz/60, 1: 1Hz */
 #define VT8500_RTC_CR_CALIB     (1 << 4)        /* Enable calibration */
 
+#define VT8500_RTC_IS_ALARM     (1 << 0)        /* Alarm interrupt status */
+
 struct vt8500_rtc {
         void __iomem            *regbase;
         struct resource         *res;
@@ -96,7 +98,7 @@ static irqreturn_t vt8500_rtc_irq(int irq, void *dev_id)
 
         spin_unlock(&vt8500_rtc->lock);
 
-        if (isr & 1)
+        if (isr & VT8500_RTC_IS_ALARM)
                 events |= RTC_AF | RTC_IRQF;
 
         rtc_update_irq(vt8500_rtc->rtc, 1, events);
@@ -161,8 +163,8 @@ static int vt8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         alrm->time.tm_sec = bcd2bin((alarm & TIME_SEC_MASK));
 
         alrm->enabled = (alarm & ALARM_ENABLE_MASK) ? 1 : 0;
+        alrm->pending = (isr & VT8500_RTC_IS_ALARM) ? 1 : 0;
 
-        alrm->pending = (isr & 1) ? 1 : 0;
         return rtc_valid_tm(&alrm->time);
 }