diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-04-01 06:34:12 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-04-01 06:34:12 +0000 |
| commit | 3ed49ce8da85e1be3473752b22e2f53d66aa771a (patch) | |
| tree | ba8ee63e416536aed90cfff4bfa8bcf5884bd768 /sys/pc98/apm | |
| parent | 2cfe5c814138eaad00cdcdb04d8da9a205d0ee33 (diff) | |
| download | src-3ed49ce8da85e1be3473752b22e2f53d66aa771a.tar.gz src-3ed49ce8da85e1be3473752b22e2f53d66aa771a.zip | |
Merged from sys/i386/apm/apm.c revision 1.121.
Notes
Notes:
svn path=/head/; revision=75052
Diffstat (limited to 'sys/pc98/apm')
| -rw-r--r-- | sys/pc98/apm/apm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/pc98/apm/apm.c b/sys/pc98/apm/apm.c index cd0e66f3af55..cb690b162b1e 100644 --- a/sys/pc98/apm/apm.c +++ b/sys/pc98/apm/apm.c @@ -750,7 +750,7 @@ apm_timeout(void *dummy) if (sc->active == 1) /* Run slightly more oftan than 1 Hz */ - apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1 ); + apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1); } /* enable APM BIOS */ @@ -828,13 +828,14 @@ apm_probe(device_t dev) int rid; #endif - if (resource_int_value("apm", 0, "disabled", &disabled) == 0 - && disabled != 0) - return ENXIO; - device_set_desc(dev, "APM BIOS"); - if ( device_get_unit(dev) > 0 ) { + if (resource_int_value("apm", 0, "disabled", &disabled) != 0) + disabled = 0; + if (disabled) + return ENXIO; + + if (device_get_unit(dev) > 0) { printf("apm: Only one APM driver supported.\n"); return ENXIO; } |