From b56b75259b6e6078dcf056e2b78c704c937e9d87 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Tue, 19 Oct 2010 17:05:51 +0000 Subject: [PATCH] Do not apply do_power_resume for suspending case. When do_powerstate was splitted into do_power_resume and do_power_nodriver, it became stale. --- sys/dev/pci/pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 450cb3e5d681..fc30e5511844 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -2911,9 +2911,6 @@ pci_set_power_children(device_t dev, device_t *devlist, int numdevs, struct pci_devinfo *dinfo; int dstate, i; - if (!pci_do_power_resume) - return; - /* * Set the device to the given state. If the firmware suggests * a different power state, use it instead. If power management @@ -2976,7 +2973,9 @@ pci_resume(device_t dev) */ if ((error = device_get_children(dev, &devlist, &numdevs)) != 0) return (error); - pci_set_power_children(dev, devlist, numdevs, PCI_POWERSTATE_D0); + if (pci_do_power_resume) + pci_set_power_children(dev, devlist, numdevs, + PCI_POWERSTATE_D0); /* Now the device is powered up, restore its config space. */ for (i = 0; i < numdevs; i++) {