diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-07 16:21:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-07 16:21:21 +0000 |
| commit | a6a589c475158a6012cad5a942ee018c4fedf6ac (patch) | |
| tree | 2eb6a29d9102829a1d2fa66eb9b77e78c2591380 /sys/dev/acpi/acpithinkpad.c | |
| parent | 370e29c897a756c10a92e223bb26a5e2bcbf2fa3 (diff) | |
The wakeup of the acpi thread is not needed. This code is being called
from inside the thread context, and will unwind into the middle of
acpi_thread, where it will check these variables
ok jordan marco kettenis canacar
Diffstat (limited to 'sys/dev/acpi/acpithinkpad.c')
| -rw-r--r-- | sys/dev/acpi/acpithinkpad.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c index e91b0ac6514..bfff2073eda 100644 --- a/sys/dev/acpi/acpithinkpad.c +++ b/sys/dev/acpi/acpithinkpad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpithinkpad.c,v 1.23 2010/07/06 20:14:17 deraadt Exp $ */ +/* $OpenBSD: acpithinkpad.c,v 1.24 2010/08/07 16:21:20 deraadt Exp $ */ /* * Copyright (c) 2008 joshua stein <jcs@openbsd.org> * @@ -283,10 +283,8 @@ thinkpad_hotkey(struct aml_node *node, int notify_type, void *arg) break; case THINKPAD_BUTTON_SUSPEND: #ifndef SMALL_KERNEL - if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ)) { + if (acpi_record_event(sc->sc_acpi, APM_USER_SUSPEND_REQ)) sc->sc_acpi->sc_sleepmode = ACPI_STATE_S3; - acpi_wakeup(sc->sc_acpi); - } #endif handled = 1; break; |