summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-23 15:24:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-23 15:24:02 +0000
commit897e19b9f8343f5bf158aa2c4903ad9753c4c249 (patch)
treea43748d4cfdd8bdf63de6b0d4988563cc3565de5 /sys/dev
parent13c25d2bc55050edb8cc0f6716c1fff592a907e1 (diff)
Walk our children in the activate function.
ok mlarkin pirofti
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 1a972470d63..2db9ae4a1a6 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci.c,v 1.69 2009/11/23 01:28:11 mlarkin Exp $ */
+/* $OpenBSD: pci.c,v 1.70 2009/11/23 15:24:01 deraadt Exp $ */
/* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */
/*
@@ -182,12 +182,14 @@ pciactivate(struct device *self, int act)
int rv = 0;
switch (act) {
- case DVACT_RESUME:
- pcipower(PWR_RESUME, self);
- break;
case DVACT_SUSPEND:
+ config_activate_children(self, act);
pcipower(PWR_SUSPEND, self);
break;
+ case DVACT_RESUME:
+ pcipower(PWR_RESUME, self);
+ config_activate_children(self, act);
+ break;
}
return (rv);
}