From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 27 23:12:24 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB5CBD51;
 Fri, 27 Jun 2014 23:12:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C92972815;
 Fri, 27 Jun 2014 23:12:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RNCOUS069438;
 Fri, 27 Jun 2014 23:12:24 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RNCOS5069437;
 Fri, 27 Jun 2014 23:12:24 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201406272312.s5RNCOS5069437@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Fri, 27 Jun 2014 23:12:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r267989 - projects/pmac_pmu/sys/dev/pci
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Jun 2014 23:12:24 -0000

Author: jhibbits
Date: Fri Jun 27 23:12:24 2014
New Revision: 267989
URL: http://svnweb.freebsd.org/changeset/base/267989

Log:
  Move the resume to *after* the config restore.  This matches existing behavior.

Modified:
  projects/pmac_pmu/sys/dev/pci/pci.c

Modified: projects/pmac_pmu/sys/dev/pci/pci.c
==============================================================================
--- projects/pmac_pmu/sys/dev/pci/pci.c	Fri Jun 27 23:11:13 2014	(r267988)
+++ projects/pmac_pmu/sys/dev/pci/pci.c	Fri Jun 27 23:12:24 2014	(r267989)
@@ -3674,10 +3674,10 @@ pci_resume_child(device_t dev, device_t 
 
 	if (pci_do_power_resume)
 		pci_set_power_child(dev, child, PCI_POWERSTATE_D0);
-	error = bus_generic_resume_child(dev, child);
 
 	dinfo = device_get_ivars(child);
 	pci_cfg_restore(child, dinfo);
+	error = bus_generic_resume_child(dev, child);
 
 	return (error);
 }