From a7bdcc0fdef6455ae9a206f9f76a7f5115d117a6 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Wed, 11 Nov 2009 14:26:40 -0800
Subject: [PATCH] --- yaml --- r: 168575 b: refs/heads/master c:
 05f45d7d746d07c95588871abf933334856c1a3b h: refs/heads/master i:   168573:
 90e42dcda68af586d53931edb64bd9c3a0feeafb   168571:
 bca41356353eecf25c44446203bcbb2bbed964ba   168567:
 081002792a636e3325abe1a6ec2c5699178587e9   168559:
 75150cf70fa2f08a39e92b5edbdd3f663f072c67   168543:
 00505fd7fbb42d0cf6c3fb4f4d3ab16851533153   168511:
 0e89899601be00db8433bec1f1b20c23373b67cb   168447:
 9d33d6f7bfdc8580afaccc29bdbbab6aed4168a1 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/rtc/rtc-pcf50633.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 190c7b11d7b9..eeb44cb12d33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 265f2a057bf6b567a32bb16dc8b1765cf0555d9f
+refs/heads/master: 05f45d7d746d07c95588871abf933334856c1a3b
diff --git a/trunk/drivers/rtc/rtc-pcf50633.c b/trunk/drivers/rtc/rtc-pcf50633.c
index 77b40ddd66e6..33a10c47260e 100644
--- a/trunk/drivers/rtc/rtc-pcf50633.c
+++ b/trunk/drivers/rtc/rtc-pcf50633.c
@@ -245,8 +245,9 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 	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;
 }