diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-11-23 22:34:24 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-11-23 22:34:24 +0000 |
| commit | 54343ec8b8822ce5745f22e76920568fa00499a0 (patch) | |
| tree | 1311db741d15e564df72b88acd50891fd9e6b54c /sys/dev/pci | |
| parent | 2642627049169b2075a9253915698154e1138979 (diff) | |
pci should return the result of it's children's suspend/resume calls back
to its parent.
handle suspend failure case and unwind if devices have an activate function
that returns failure.
ok deraadt@, kettenis@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 2db9ae4a1a6..02e73fa1346 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.70 2009/11/23 15:24:01 deraadt Exp $ */ +/* $OpenBSD: pci.c,v 1.71 2009/11/23 22:34:23 mlarkin Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -183,12 +183,12 @@ pciactivate(struct device *self, int act) switch (act) { case DVACT_SUSPEND: - config_activate_children(self, act); + rv = config_activate_children(self, act); pcipower(PWR_SUSPEND, self); break; case DVACT_RESUME: pcipower(PWR_RESUME, self); - config_activate_children(self, act); + rv = config_activate_children(self, act); break; } return (rv); |