---

yaml --- r: 168575 b: refs/heads/master c: 05f45d7 h: refs/heads/master i: 168573: 90e42dc 168571: bca4135 168567: 0810027 168559: 75150cf 168543: 00505fd 168511: 0e89899 168447: 9d33d6f v: v3
git-mirror · Nov 12, 2009 · a7bdcc0 · a7bdcc0
1 parent 4e5b52d
commit a7bdcc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 }