From owner-svn-src-all@FreeBSD.ORG Mon Nov 17 20:25:21 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D76D9E4B; Mon, 17 Nov 2014 20:25:21 +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 C469DFCD; Mon, 17 Nov 2014 20:25:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHKPLfO055667; Mon, 17 Nov 2014 20:25:21 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHKPLMl055666; Mon, 17 Nov 2014 20:25:21 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201411172025.sAHKPLMl055666@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Mon, 17 Nov 2014 20:25:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274635 - head/sys/dev/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 20:25:22 -0000 Author: dchagin Date: Mon Nov 17 20:25:21 2014 New Revision: 274635 URL: https://svnweb.freebsd.org/changeset/base/274635 Log: Use the correct device as the power_for_sleep() method always pass request up to parent bridge. Reviewed by: jhb MFC after: 1 week xMFC: r274386,r274397 Modified: head/sys/dev/pci/pci.c Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Mon Nov 17 17:17:10 2014 (r274634) +++ head/sys/dev/pci/pci.c Mon Nov 17 20:25:21 2014 (r274635) @@ -3637,7 +3637,6 @@ static void pci_set_power_child(device_t dev, device_t child, int state) { struct pci_devinfo *dinfo; - device_t pcib; int dstate; /* @@ -3647,11 +3646,10 @@ pci_set_power_child(device_t dev, device * device power. Skip children who aren't attached since they * are handled separately. */ - pcib = device_get_parent(dev); dinfo = device_get_ivars(child); dstate = state; if (device_is_attached(child) && - PCIB_POWER_FOR_SLEEP(pcib, child, &dstate) == 0) + PCIB_POWER_FOR_SLEEP(dev, child, &dstate) == 0) pci_set_powerstate(child, dstate); }