aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1997-11-04 17:37:52 +0000
committerNate Williams <nate@FreeBSD.org>1997-11-04 17:37:52 +0000
commit5796e497dc58513f9e1fe4df472178846e770c7d (patch)
treeedfda38ee374ef742e27b8ced18639d020b0c17c /sys
parenteb072158c0cef9b4e4d8fa116c6c7329db22f18a (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/apm/apm.c9
-rw-r--r--sys/i386/bios/apm.c9
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 4fe3dd287348..827898565e14 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.60 1997/09/21 21:33:10 gibbs Exp $
+ * $Id: apm.c,v 1.62 1997/10/23 04:18:49 nate Exp $
*/
#include <sys/param.h>
@@ -400,8 +400,11 @@ apm_suspend(void)
if (sc->initialized) {
apm_execute_hook(hook[APM_HOOK_SUSPEND]);
- apm_suspend_system();
- apm_processevent();
+ if (apm_suspend_system() == 0)
+ apm_processevent();
+ else
+ // Failure, 'resume' the system again
+ apm_execute_hook(hook[APM_HOOK_RESUME]);
}
}
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 4fe3dd287348..827898565e14 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.60 1997/09/21 21:33:10 gibbs Exp $
+ * $Id: apm.c,v 1.62 1997/10/23 04:18:49 nate Exp $
*/
#include <sys/param.h>
@@ -400,8 +400,11 @@ apm_suspend(void)
if (sc->initialized) {
apm_execute_hook(hook[APM_HOOK_SUSPEND]);
- apm_suspend_system();
- apm_processevent();
+ if (apm_suspend_system() == 0)
+ apm_processevent();
+ else
+ // Failure, 'resume' the system again
+ apm_execute_hook(hook[APM_HOOK_RESUME]);
}
}