From 29179058bc06a288380e60a3658a29a543e162e1 Mon Sep 17 00:00:00 2001 From: Matti Halme Date: Thu, 15 Jan 2009 13:50:56 -0800 Subject: [PATCH] --- yaml --- r: 129665 b: refs/heads/master c: cafa1d8b0c90252e73f20db1b6f32cf88e73ff17 h: refs/heads/master i: 129663: e391a7ccfb7aa36784768d2f2cbbf54f9e9f6fad v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-twl4030.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b833c67b4fe7..88ff86eecedd 100644 --- 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 index 25dc3e1cedbe..ad35f76c46b7 100644 --- 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