From owner-svn-src-head@FreeBSD.ORG  Sat May 22 03:19:30 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2552106564A;
	Sat, 22 May 2010 03:19:30 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BF708FC08;
	Sat, 22 May 2010 03:19:30 +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 o4M3JU8m030760;
	Sat, 22 May 2010 03:19:30 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4M3JUGY030758;
	Sat, 22 May 2010 03:19:30 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201005220319.o4M3JUGY030758@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 22 May 2010 03:19:30 +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: r208409 - head/sys/dev/pci
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 May 2010 03:19:31 -0000

Author: mav
Date: Sat May 22 03:19:30 2010
New Revision: 208409
URL: http://svn.freebsd.org/changeset/base/208409

Log:
  Honor hw.pci.do_power_nodriver on resume. Power-down devices without
  driver attached.

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

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Sat May 22 01:01:59 2010	(r208408)
+++ head/sys/dev/pci/pci.c	Sat May 22 03:19:30 2010	(r208409)
@@ -2988,6 +2988,8 @@ pci_resume(device_t dev)
 
 		/* Now the device is powered up, restore its config space. */
 		pci_cfg_restore(child, dinfo);
+		if (!device_is_attached(child))
+			pci_cfg_save(child, dinfo, 1);
 	}
 	free(devlist, M_TEMP);
 	return (bus_generic_resume(dev));