From owner-svn-src-all@FreeBSD.ORG Tue Nov 11 19:49:17 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 1A1F0615; Tue, 11 Nov 2014 19:49:17 +0000 (UTC) Received: from mail-ie0-x22c.google.com (mail-ie0-x22c.google.com [IPv6:2607:f8b0:4001:c03::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D4DBC269; Tue, 11 Nov 2014 19:49:16 +0000 (UTC) Received: by mail-ie0-f172.google.com with SMTP id at20so12203520iec.3 for ; Tue, 11 Nov 2014 11:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=LgqJFXYHuSOdbeVDYt0h/E033av8B/sqYj+vgv1x/4Y=; b=0W8pZ0rz4G+hJoYv8eNnNYNyHlg6cVWlZMWla4astgZMVeTqTX3VbyCl1ZWnWiGpaW haaPdxvW1FamcpWcjsHoZMfQ4uSp6zTj748s6ahzMmzOiyqsRVN2lblOTlSqd9fMu8xS DuHiLpsECSxkPQwfwR+qvkmF+HEflaL1Rbq/jcgdrSjVRdde0e3xuIQbvmn3gORKxhz6 BxoPqLHMs7aTLkKnJmzb9NvrF2gKP1Uo4nETOlxQhFH9b/PG4YFEGZ/aIRHwkXFN+F7z TbyzBZdAEfUq6zwpaczB3O4J7lHJqrWC5jtBBhciMbDP25UdoI+RaQu36Safwe+On0XW uptw== MIME-Version: 1.0 X-Received: by 10.107.10.160 with SMTP id 32mr3000180iok.85.1415735356270; Tue, 11 Nov 2014 11:49:16 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.50.232.180 with HTTP; Tue, 11 Nov 2014 11:49:16 -0800 (PST) In-Reply-To: <201411111942.sABJgA7W072031@svn.freebsd.org> References: <201411111942.sABJgA7W072031@svn.freebsd.org> Date: Tue, 11 Nov 2014 11:49:16 -0800 X-Google-Sender-Auth: 8_LXcc3LeY_M3lExYgOC6_czN-I Message-ID: Subject: Re: svn commit: r274397 - head/sys/dev/acpica From: Adrian Chadd To: Jung-uk Kim Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" 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: Tue, 11 Nov 2014 19:49:17 -0000 Hah, good catch! -adrian On 11 November 2014 11:42, Jung-uk Kim wrote: > Author: jkim > Date: Tue Nov 11 19:42:10 2014 > New Revision: 274397 > URL: https://svnweb.freebsd.org/changeset/base/274397 > > Log: > Use the correct device. Note this commit complements r274386. > > PR: 194884 > > Modified: > head/sys/dev/acpica/acpi.c > > Modified: head/sys/dev/acpica/acpi.c > ============================================================================== > --- head/sys/dev/acpica/acpi.c Tue Nov 11 19:40:05 2014 (r274396) > +++ head/sys/dev/acpica/acpi.c Tue Nov 11 19:42:10 2014 (r274397) > @@ -694,7 +694,7 @@ acpi_attach(device_t dev) > static void > acpi_set_power_children(device_t dev, int state) > { > - device_t child, parent; > + device_t child; > device_t *devlist; > int dstate, i, numdevs; > > @@ -705,12 +705,11 @@ acpi_set_power_children(device_t dev, in > * Retrieve and set D-state for the sleep state if _SxD is present. > * Skip children who aren't attached since they are handled separately. > */ > - parent = device_get_parent(dev); > for (i = 0; i < numdevs; i++) { > child = devlist[i]; > dstate = state; > if (device_is_attached(child) && > - acpi_device_pwr_for_sleep(parent, child, &dstate) == 0) > + acpi_device_pwr_for_sleep(dev, child, &dstate) == 0) > acpi_set_powerstate(child, dstate); > } > free(devlist, M_TEMP); >