aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 23:17:14 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 23:17:14 -0400
commit5b4b7a236e7787f16af4e15a6253d46d8e794be6 (patch)
treef38fce923719c0d2cb893fe04f5513cf8009755b /drivers/acpi/sleep
parent785fcccd68bd4dc436f75fd4cd40e8557966c86d (diff)
parent872d83d00f67021e036d75aab3b7c6e3fc7e29ee (diff)
Pull button into release branch
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r--drivers/acpi/sleep/main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 930427fc0c4b..62ce87d71651 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state)
105 default: 105 default:
106 return -EINVAL; 106 return -EINVAL;
107 } 107 }
108
109 /* ACPI 3.0 specs (P62) says that it's the responsabilty
110 * of the OSPM to clear the status bit [ implying that the
111 * POWER_BUTTON event should not reach userspace ]
112 */
113 if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
114 acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
115
108 local_irq_restore(flags); 116 local_irq_restore(flags);
109 printk(KERN_DEBUG "Back to C!\n"); 117 printk(KERN_DEBUG "Back to C!\n");
110 118