diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 02:38:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 02:38:19 +0000 |
| commit | d1fbae0933cba12c4c8d5c44ce5e368ca52bc838 (patch) | |
| tree | da5e703aa38d1bf9bb8cb3f7dccba270982d01a1 /sys/dev/acpi | |
| parent | 4c9416fe0b54a36c5e3c1d886f68701e9c0977a7 (diff) | |
MI disable_lid_wakeups() is not needed, x86 systems can do this
in sleep_resume(), which seems sensible for other future systems also
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi_x86.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c index dd7d9a54bb1..de9a7373210 100644 --- a/sys/dev/acpi/acpi_x86.c +++ b/sys/dev/acpi/acpi_x86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_x86.c,v 1.4 2022/02/15 02:29:23 deraadt Exp $ */ +/* $OpenBSD: acpi_x86.c,v 1.5 2022/02/15 02:38:17 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -140,6 +140,8 @@ sleep_resume(void *v) { struct acpi_softc *sc = v; + acpibtn_disable_psw(); /* disable _LID for wakeup */ + /* 3rd resume AML step: _TTS(runstate) */ if (aml_node_setval(sc, sc->sc_tts, sc->sc_state) != 0) return (EINVAL); @@ -162,13 +164,6 @@ suspend_finish(void *v) } void -disable_lid_wakeups(void *v) -{ - acpibtn_disable_psw(); /* disable _LID for wakeup */ - -} - -void display_suspend(void *v) { #if NWSDISPLAY > 0 |