diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 16:16:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 16:16:13 +0000 |
| commit | 552d12f77a67684ac38bb3d2a76e886d344a16bf (patch) | |
| tree | 836f716d688d8138e871a09f8fa0c45e9c88374d /sys | |
| parent | a56b81ce2d94b556d845fd1e8950b6f0c38b5d87 (diff) | |
pchbactivate should return result of config_activate_children
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/pci/pchb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c index e715e3097c4..40bbc39bf41 100644 --- a/sys/arch/amd64/pci/pchb.c +++ b/sys/arch/amd64/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.35 2010/08/07 06:10:04 deraadt Exp $ */ +/* $OpenBSD: pchb.c,v 1.36 2010/08/31 16:16:12 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -276,10 +276,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 */ @@ -288,13 +289,12 @@ 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); } - int pchb_print(void *aux, const char *pnp) { |