diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-02-21 23:48:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-02-21 23:48:39 +0000 |
| commit | 7d43cda42cfdc3421aa32ba513557894a9a37689 (patch) | |
| tree | e160c80d99fac3799b4539bff2411f8e930d1c9d | |
| parent | ddf2fb64364b265fe3d64291c2c4225cc6f887d3 (diff) | |
Do the lid control further on in the resume sequence, since this is
AML, and will do WAITOK operations. While cold, that is a bad idea.
We seem to be safe with respect to the spec, I do not see any event
debounce issues here.
ok kettenis, tested by many
| -rw-r--r-- | sys/dev/acpi/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 4ecd80374f3..8c9f6064c7a 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.252 2014/01/20 00:47:21 claudio Exp $ */ +/* $OpenBSD: acpi.c,v 1.253 2014/02/21 23:48:38 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -2170,7 +2170,6 @@ acpi_sleep_state(struct acpi_softc *sc, int state) acpi_resume_clocks(sc); /* AML may need clocks */ acpi_resume_pm(sc, state); acpi_resume_cpu(sc); - acpibtn_disable_psw(); /* disable _LID for wakeup */ fail_pts: config_suspend(TAILQ_FIRST(&alldevs), DVACT_RESUME); @@ -2180,6 +2179,7 @@ fail_suspend: enable_intr(); splx(s); + acpibtn_disable_psw(); /* disable _LID for wakeup */ inittodr(time_second); /* 3rd resume AML step: _TTS(runstate) */ |