From dcd4997abbd5bde0a42304c33b5cc655226bdab3 Mon Sep 17 00:00:00 2001 From: kettenis Date: Mon, 14 Feb 2022 23:42:37 +0000 Subject: [PATCH] Make sure we call acpi_resume_cpu() with the right ACPI state. This was accidentally broken with the reorganization of the suspend/resume code that was committed a few days ago. ok deraadt@ --- sys/dev/acpi/acpi_x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpi/acpi_x86.c b/sys/dev/acpi/acpi_x86.c index 8d844ff1ff6..c99c147792f 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.2 2022/02/14 19:25:03 deraadt Exp $ */ +/* $OpenBSD: acpi_x86.c,v 1.3 2022/02/14 23:42:37 kettenis Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert * Copyright (c) 2005 Jordan Hargrave @@ -129,10 +129,10 @@ gosleep(void *v) /* Sleep */ acpi_sleep_cpu(sc, sc->sc_state); - sc->sc_state = ACPI_STATE_S0; /* Resume */ acpi_resume_cpu(sc, sc->sc_state); + sc->sc_state = ACPI_STATE_S0; } int -- 2.20.1