From 54343ec8b8822ce5745f22e76920568fa00499a0 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Mon, 23 Nov 2009 22:34:24 +0000 Subject: 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@ --- sys/dev/pci/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/dev/pci') 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); -- cgit v1.2.3