diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-05-30 16:15:01 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-05-30 16:15:01 +0000 |
| commit | c06fda6d0724f63f24685adf5b3d7f3ead24829d (patch) | |
| tree | 1f027428818a55ed1ab7b65fb609867de3c20ad9 /sys/dev/pci/tcpcib.c | |
| parent | Simplify hello holdtime calculation and stop the timeout timer if the (diff) | |
| download | wireguard-openbsd-c06fda6d0724f63f24685adf5b3d7f3ead24829d.tar.xz wireguard-openbsd-c06fda6d0724f63f24685adf5b3d7f3ead24829d.zip | |
Enforce ca_activate tree-walks over the entire heirarchy for all events,
cleaning up some shutdown-hook related code on the way.
(A few drivers related to sparc are still skipped at kettenis' request)
ok kettenis mlarkin, tested by many others too
Diffstat (limited to 'sys/dev/pci/tcpcib.c')
| -rw-r--r-- | sys/dev/pci/tcpcib.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/pci/tcpcib.c b/sys/dev/pci/tcpcib.c index 3f8386c78db..0b6f93d56a3 100644 --- a/sys/dev/pci/tcpcib.c +++ b/sys/dev/pci/tcpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $ */ +/* $OpenBSD: tcpcib.c,v 1.5 2013/05/30 16:15:02 deraadt Exp $ */ /* * Copyright (c) 2012 Matt Dainty <matt@bodgit-n-scarper.com> @@ -269,9 +269,11 @@ int tcpcib_activate(struct device *self, int act) { struct tcpcib_softc *sc = (struct tcpcib_softc *)self; - + int ret = 0; + switch (act) { case DVACT_SUSPEND: + ret = config_activate_children(self, act); /* Watchdog is running, disable it */ if (sc->sc_active & E600_WDT_ACTIVE && sc->sc_wdt_period != 0) tcpcib_wdt_stop(sc); @@ -291,9 +293,13 @@ tcpcib_activate(struct device *self, int act) if (sc->sc_active & E600_HPET_ACTIVE) bus_space_write_4(sc->sc_hpet_iot, sc->sc_hpet_ioh, E600_HPET_GC, E600_HPET_GC_ENABLE); + ret = config_activate_children(self, act); + break; + default: + ret = config_activate_children(self, act); break; } - return (0); + return (ret); } int |