Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Nov 2014 19:42:10 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r274397 - head/sys/dev/acpica
Message-ID:  <201411111942.sABJgA7W072031@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411111942.sABJgA7W072031>