diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-05-30 16:15:03 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-05-30 16:15:03 +0000 |
commit | 0a2136fff807fb71339f3d499b31f09ef14bf891 (patch) | |
tree | 8996416e2647c8beebebaa3a97c2205aed0adce3 /sys/dev/pci/azalia.c | |
parent | 52c68f7659b12bec7c8ef0539aca056f2550327b (diff) |
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/azalia.c')
-rw-r--r-- | sys/dev/pci/azalia.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index a9668679380..5cfc8eb80a1 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.205 2013/05/24 07:58:46 ratchov Exp $ */ +/* $OpenBSD: azalia.c,v 1.206 2013/05/30 16:15:02 deraadt Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -550,8 +550,6 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux) sc->audiodev = audio_attach_mi(&azalia_hw_if, sc, &sc->dev); - shutdownhook_establish(azalia_shutdown, sc); - return; err_exit: @@ -572,6 +570,9 @@ azalia_pci_activate(struct device *self, int act) case DVACT_SUSPEND: azalia_suspend(sc); break; + case DVACT_POWERDOWN: + azalia_shutdown(sc); + break; case DVACT_RESUME: azalia_resume(sc); rv = config_activate_children(self, act); |