diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-29 02:02:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-29 02:02:27 +0000 |
| commit | 41f14e555e358d9cdf112c5956c11fa73088fa2b (patch) | |
| tree | a67745549f238aba486d7cba6a1ec2dbcc5ac104 /sys/arch | |
| parent | 6064330cafb2b636115f3c93cbf96d6d9667d38f (diff) | |
put the bufq_restart() in the right place, so that a 2nd resume works.
how did noone notice for so long? tsk, tsk, tsk. of course, I broke it.
tested by jakemsr
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_apm.c | 5 | ||||
| -rw-r--r-- | sys/arch/zaurus/dev/zaurus_apm.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_apm.c b/sys/arch/arm/xscale/pxa2x0_apm.c index a009324dc8d..02d5df269c6 100644 --- a/sys/arch/arm/xscale/pxa2x0_apm.c +++ b/sys/arch/arm/xscale/pxa2x0_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_apm.c,v 1.32 2010/03/30 17:40:55 oga Exp $ */ +/* $OpenBSD: pxa2x0_apm.c,v 1.33 2010/08/29 02:02:25 deraadt Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -42,6 +42,7 @@ #include <sys/rwlock.h> #include <sys/mount.h> /* for vfs_syncwait() */ #include <sys/proc.h> +#include <sys/buf.h> #include <sys/device.h> #include <sys/fcntl.h> #include <sys/ioctl.h> @@ -338,6 +339,8 @@ apm_resume(struct pxa2x0_apm_softc *sc) */ /* XXX ifdef NPXAUDC > 0 */ bus_space_write_4(sc->sc_iot, sc->sc_pm_ioh, POWMAN_PSSR, PSSR_OTGPH); + + bufq_restart(); #if NWSDISPLAY > 0 wsdisplay_resume(); #endif /* NWSDISPLAY > 0 */ diff --git a/sys/arch/zaurus/dev/zaurus_apm.c b/sys/arch/zaurus/dev/zaurus_apm.c index 422c53aba4a..af4dd49511a 100644 --- a/sys/arch/zaurus/dev/zaurus_apm.c +++ b/sys/arch/zaurus/dev/zaurus_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_apm.c,v 1.16 2010/07/20 12:23:02 deraadt Exp $ */ +/* $OpenBSD: zaurus_apm.c,v 1.17 2010/08/29 02:02:26 deraadt Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de> @@ -634,7 +634,6 @@ zapm_resume(struct pxa2x0_apm_softc *pxa_sc) #endif } - bufq_restart(); return (wakeup); } |