d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when halting where APM was configured but not enabled

Browse Source 
by checking whether APM is active in apm_power_off() and returning
if not.  (The code was already written with the expectation that
this function would return if it fails.)
This commit is contained in:
wollman 1997-06-19 00:25:03 +00:00
parent 28055a0cae
commit 9288358341
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/apm/apm.c
View File

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.57 1997/06/15 02:02:41 wollman Exp $
* $Id: apm.c,v 1.58 1997/06/15 02:19:40 wollman Exp $
*/
#include <sys/param.h>
@ -231,6 +231,8 @@ apm_power_off(void)
{
u_long eax, ebx, ecx;
if (!apm_softc.active)
return;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_OFF;

4
sys/i386/bios/apm.c
View File

@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
* $Id: apm.c,v 1.57 1997/06/15 02:02:41 wollman Exp $
* $Id: apm.c,v 1.58 1997/06/15 02:19:40 wollman Exp $
*/
#include <sys/param.h>
@ -231,6 +231,8 @@ apm_power_off(void)
{
u_long eax, ebx, ecx;
if (!apm_softc.active)
return;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_OFF;