svn commit: r214064 - head/sys/dev/pci

[Jung-uk Kim]

Author: jkim
Date: Tue Oct 19 17:05:51 2010
New Revision: 214064
URL: http://svn.freebsd.org/changeset/base/214064

Log:
  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.

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Tue Oct 19 16:48:49 2010	(r214063)
+++ head/sys/dev/pci/pci.c	Tue Oct 19 17:05:51 2010	(r214064)
@@ -2911,9 +2911,6 @@ pci_set_power_children(device_t dev, dev
 	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++) {