summaryrefslogtreecommitdiff
path: root/drivers/acpi/glue.c
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2008-05-14 11:32:59 +0800
committerLen Brown <len.brown@intel.com>2008-06-11 19:13:45 -0400
commite1094bfa26e5e94af2fea79e004614dbce42b008 (patch)
treeb9a610ca0a45b5bf7d3cbc73e6923225b16d7436 /drivers/acpi/glue.c
parent28ffb5d3e0b563be5a9639c3a2b42f1a9430454f (diff)
downloadlinux-3.10-e1094bfa26e5e94af2fea79e004614dbce42b008.tar.gz
linux-3.10-e1094bfa26e5e94af2fea79e004614dbce42b008.tar.bz2
linux-3.10-e1094bfa26e5e94af2fea79e004614dbce42b008.zip
ACPI: Disable Fixed_RTC event when installing RTC handler
The Fixed_RTC event should be disabled when installing RTC handler. Only when RTC alarm is set will it be enabled again. If it is not disabled, maybe some machines will be powered on automatically after the system is shutdown even when the RTC alarm is not set. http://bugzilla.kernel.org/show_bug.cgi?id=10010 Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r--drivers/acpi/glue.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 06f8634fe58..2808dc60fd6 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -272,6 +272,12 @@ static u32 rtc_handler(void *context)
static inline void rtc_wake_setup(void)
{
acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
+ /*
+ * After the RTC handler is installed, the Fixed_RTC event should
+ * be disabled. Only when the RTC alarm is set will it be enabled.
+ */
+ acpi_clear_event(ACPI_EVENT_RTC);
+ acpi_disable_event(ACPI_EVENT_RTC, 0);
}
static void rtc_wake_on(struct device *dev)