---

yaml --- r: 129665 b: refs/heads/master c: cafa1d8 h: refs/heads/master i: 129663: e391a7c v: v3
git-mirror · Jan 16, 2009 · 2917905 · 2917905
1 parent 63ed8a6
commit 2917905
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4216d0bd8fef77b7926eb065a766e2ee003acf6a
+refs/heads/master: cafa1d8b0c90252e73f20db1b6f32cf88e73ff17
diff --git a/trunk/drivers/rtc/rtc-twl4030.c b/trunk/drivers/rtc/rtc-twl4030.c
@@ -482,8 +482,9 @@ static int __devexit twl4030_rtc_remove(struct platform_device *pdev)
 
 static void twl4030_rtc_shutdown(struct platform_device *pdev)
 {
-	mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
-			 BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
+	/* mask timer interrupts, but leave alarm interrupts on to enable
+	   power-on when alarm is triggered */
+	mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
 }
 
 #ifdef CONFIG_PM