1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 87c5d456e180..0f2dd81736bd 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -274,6 +274,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)
@@ -329,6 +335,12 @@ static int __init acpi_rtc_init(void)
 {
         struct device *dev = get_rtc_dev();
 
+        if (acpi_disabled)
+                return 0;
+
+        if (acpi_disabled)
+                return 0;
+
         if (dev) {
                 rtc_wake_setup();
                 rtc_info.wake_on = rtc_wake_on;