summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-31 16:17:19 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-31 16:17:19 +0000
commita153d7f94bbc42ed019303f5194578cb74d6e79d (patch)
tree632c88b2ad2f5f686d3be458fb1ffdd2cc4c4c2a /sys/arch
parent552d12f77a67684ac38bb3d2a76e886d344a16bf (diff)
pchbactivate should return result of config_activate_children
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/pci/pchb.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 3b594a5a269..bffa7bb3b14 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.83 2010/08/07 06:10:06 deraadt Exp $ */
+/* $OpenBSD: pchb.c,v 1.84 2010/08/31 16:17:18 deraadt Exp $ */
/* $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $ */
/*
@@ -419,10 +419,11 @@ int
pchbactivate(struct device *self, int act)
{
struct pchb_softc *sc = (struct pchb_softc *)self;
+ int rv = 0;
switch (act) {
case DVACT_SUSPEND:
- config_activate_children(self, act);
+ rv = config_activate_children(self, act);
break;
case DVACT_RESUME:
/* re-enable RNG, if we have it */
@@ -431,10 +432,10 @@ pchbactivate(struct device *self, int act)
I82802_RNG_HWST,
bus_space_read_1(sc->sc_bt, sc->sc_bh,
I82802_RNG_HWST) | I82802_RNG_HWST_ENABLE);
- config_activate_children(self, act);
+ rv = config_activate_children(self, act);
break;
}
- return (0);
+ return (rv);
}