summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2017-03-27 20:27:38 +0000
committerderaadt <deraadt@openbsd.org>2017-03-27 20:27:38 +0000
commite1bded000c049660b1bd568e66ca122edad20911 (patch)
tree3778e92aeee66f98da3526159dd116c50cfd32d1
parentIf hibernate_alloc() encounters a problem it should undo the partial (diff)
downloadwireguard-openbsd-e1bded000c049660b1bd568e66ca122edad20911.tar.xz
wireguard-openbsd-e1bded000c049660b1bd568e66ca122edad20911.zip
Now that hibernate_alloc() only has clean success/failure, don't
need to call hibernate_free() to clean up a partial mess. ok mlarkin kettenis
-rw-r--r--sys/dev/acpi/acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 1a26b08f893..d616ce33741 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.325 2017/03/13 01:50:49 deraadt Exp $ */
+/* $OpenBSD: acpi.c,v 1.326 2017/03/27 20:27:38 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -2489,9 +2489,9 @@ fail_quiesce:
config_suspend_all(DVACT_WAKEUP);
#ifdef HIBERNATE
-fail_alloc:
if (sleepmode == ACPI_SLEEP_HIBERNATE) {
hibernate_free();
+fail_alloc:
hibernate_resume_bufcache();
}
#endif /* HIBERNATE */