X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fglue.c;h=2808dc60fd670065a94ddf4c0be90876fd3fc20a;hb=1b3cba8e60c67c968d108ac55c77e32c1928dec3;hp=06f8634fe58b192498ad73c5e4d4a4e715b01cf3;hpb=d626e3bf728c47746f2129aa00c775d4e8c2a73b;p=linux-2.6

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 06f8634fe5..2808dc60fd 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)