From owner-svn-src-all@FreeBSD.ORG  Tue Oct 19 17:05:51 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C150F106566C;
	Tue, 19 Oct 2010 17:05:51 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AED0A8FC0A;
	Tue, 19 Oct 2010 17:05:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9JH5ppD021163;
	Tue, 19 Oct 2010 17:05:51 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9JH5pdS021161;
	Tue, 19 Oct 2010 17:05:51 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201010191705.o9JH5pdS021161@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 19 Oct 2010 17:05:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214064 - head/sys/dev/pci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2010 17:05:51 -0000

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++) {