diff options
| author |   deraadt <deraadt@openbsd.org> | 2010-08-31 16:47:36 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2010-08-31 16:47:36 +0000 |
| commit | 50c71cd892f6e6fe4b3c3ebea1714de97c806772 (patch) | |
| tree | 85a5b6dc94a9eb59229c3fafa79bb1d9a8e2f433 /sys | |
| parent | Change the powerhook into an activation routine. It has to use a workq. (diff) | |
| download | wireguard-openbsd-50c71cd892f6e6fe4b3c3ebea1714de97c806772.tar.xz wireguard-openbsd-50c71cd892f6e6fe4b3c3ebea1714de97c806772.zip | |
sort DVACT_ actions according to the order likely to be used
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uhci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 874772f7f4a..d8700a45649 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.78 2010/08/31 03:50:15 deraadt Exp $ */ +/* $OpenBSD: uhci.c,v 1.79 2010/08/31 16:47:36 deraadt Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -529,10 +529,6 @@ uhci_activate(struct device *self, int act) switch (act) { case DVACT_ACTIVATE: break; - case DVACT_DEACTIVATE: - if (sc->sc_child != NULL) - rv = config_deactivate(sc->sc_child); - break; case DVACT_SUSPEND: #ifdef UHCI_DEBUG if (uhcidebug > 2) @@ -589,6 +585,10 @@ uhci_activate(struct device *self, int act) uhci_dumpregs(sc); #endif break; + case DVACT_DEACTIVATE: + if (sc->sc_child != NULL) + rv = config_deactivate(sc->sc_child); + break; } return (rv); } |