From 7335f476d735f75fee27c29d875cb13dca64e215 Mon Sep 17 00:00:00 2001 From: deraadt Date: Mon, 19 Aug 2024 00:01:40 +0000 Subject: [PATCH] call activate functions of children in the correct place. --- sys/dev/pci/glxpcib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/glxpcib.c b/sys/dev/pci/glxpcib.c index 08f23f3ed51..8c2bfb911d0 100644 --- a/sys/dev/pci/glxpcib.c +++ b/sys/dev/pci/glxpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glxpcib.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: glxpcib.c,v 1.17 2024/08/19 00:01:40 deraadt Exp $ */ /* * Copyright (c) 2007 Marc Balmer @@ -431,6 +431,7 @@ glxpcib_activate(struct device *self, int act) switch (act) { case DVACT_SUSPEND: + rv = config_activate_children(self, act); #ifndef SMALL_KERNEL if (sc->sc_wdog) { sc->sc_wdog_period = bus_space_read_2(sc->sc_iot, @@ -438,7 +439,6 @@ glxpcib_activate(struct device *self, int act) glxpcib_wdogctl_cb(sc, 0); } #endif - rv = config_activate_children(self, act); #ifndef SMALL_KERNEL for (i = 0; i < nitems(glxpcib_msrlist); i++) sc->sc_msrsave[i] = rdmsr(glxpcib_msrlist[i]); @@ -455,11 +455,11 @@ glxpcib_activate(struct device *self, int act) rv = config_activate_children(self, act); break; case DVACT_POWERDOWN: + rv = config_activate_children(self, act); #ifndef SMALL_KERNEL if (sc->sc_wdog) wdog_shutdown(self); #endif - rv = config_activate_children(self, act); break; default: rv = config_activate_children(self, act); -- 2.20.1