diff options
| author | imp <imp@FreeBSD.org> | 1999-04-21 07:57:55 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 1999-04-21 07:57:55 +0000 |
| commit | 4420c300813e0e09231d6f083317d3bcb0052619 (patch) | |
| tree | d1bd719f1e05e5feb0efb8dee725fc117213392b | |
| parent | 3e5b2956135ef173c55b405081b901efc580fa6c (diff) | |
| download | FreeBSD-src-4420c300813e0e09231d6f083317d3bcb0052619.zip FreeBSD-src-4420c300813e0e09231d6f083317d3bcb0052619.tar.gz | |
DEVICE_SUSPEND was always returning ENXIO for reasons unknown. For
now we noisily ignore this (and all errors). DEVICE_SUSPEND should be
corrected, but I wanted to unbreak suspend until that happens.
| -rw-r--r-- | sys/i386/apm/apm.c | 9 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 3de9481..d97b51b 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.78 1999/04/16 21:22:05 peter Exp $ + * $Id: apm.c,v 1.79 1999/04/18 15:10:58 dfr Exp $ */ #include "opt_devfs.h" @@ -439,8 +439,13 @@ apm_suspend(int state) if (sc->initialized) { error = DEVICE_SUSPEND(root_bus); + /* + * XXX Shouldn't ignore the error like this, but should + * instead fix the newbus code. Until that happens, + * I'm doing this to get suspend working again. + */ if (error) - return; /* XXX no error reporting */ + printf("DEVICE_SUSPEND error %d, ignored\n", error); apm_execute_hook(hook[APM_HOOK_SUSPEND]); if (apm_suspend_system(state) == 0) apm_processevent(); diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 3de9481..d97b51b 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.78 1999/04/16 21:22:05 peter Exp $ + * $Id: apm.c,v 1.79 1999/04/18 15:10:58 dfr Exp $ */ #include "opt_devfs.h" @@ -439,8 +439,13 @@ apm_suspend(int state) if (sc->initialized) { error = DEVICE_SUSPEND(root_bus); + /* + * XXX Shouldn't ignore the error like this, but should + * instead fix the newbus code. Until that happens, + * I'm doing this to get suspend working again. + */ if (error) - return; /* XXX no error reporting */ + printf("DEVICE_SUSPEND error %d, ignored\n", error); apm_execute_hook(hook[APM_HOOK_SUSPEND]); if (apm_suspend_system(state) == 0) apm_processevent(); |
