From 7afe0d954732de7dfcd661350cea05db8219f2e4 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 25 Nov 2010 00:08:36 +0100
Subject: [PATCH] --- yaml --- r: 230895 b: refs/heads/master c:
 ade3e7fef794781c0798d0cf0f046123842ba550 h: refs/heads/master i:   230893:
 c833bc03416d3aa0d6161e2474889db7148d3c28   230891:
 be1d66c8561fa7ff25a2e8be0c5ae7317fe8a82f   230887:
 825de1cb0c9309f7a8e6f045249ad5b7f9932762   230879:
 0c7d7d0b5394279f3be47fb0a2f677ca12022182 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/bus.c      | 25 +++++++++++++++++++++++++
 trunk/drivers/acpi/internal.h |  1 +
 trunk/drivers/acpi/scan.c     |  5 +----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 407d38724998..1a8fc14ba601 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e6d4fe4296782f1f095575b8213a97c3e925a16
+refs/heads/master: ade3e7fef794781c0798d0cf0f046123842ba550
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index 9657abc4a7fb..453451090502 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/drivers/acpi/bus.c
@@ -364,6 +364,31 @@ int acpi_bus_set_power(acpi_handle handle, int state)
 
 EXPORT_SYMBOL(acpi_bus_set_power);
 
+
+int acpi_bus_init_power(struct acpi_device *device)
+{
+	int state;
+	int result;
+
+	if (!device)
+		return -EINVAL;
+
+	device->power.state = ACPI_STATE_UNKNOWN;
+
+	result = __acpi_bus_get_power(device, &state);
+	if (result)
+		return result;
+
+	if (device->power.flags.power_resources)
+		result = acpi_power_on_resources(device, state);
+
+	if (!result)
+		device->power.state = state;
+
+	return result;
+}
+
+
 bool acpi_bus_power_manageable(acpi_handle handle)
 {
 	struct acpi_device *device;
diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
index 433a8ee8ac2c..7493e6c7a003 100644
--- a/trunk/drivers/acpi/internal.h
+++ b/trunk/drivers/acpi/internal.h
@@ -44,6 +44,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
 int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 int acpi_power_on_resources(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
+int acpi_bus_init_power(struct acpi_device *device);
 extern int acpi_power_nocheck;
 
 int acpi_wakeup_device_init(void);
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 29ef505c487b..ef8e659771e1 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -901,10 +901,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
 	device->power.states[ACPI_STATE_D3].flags.valid = 1;
 	device->power.states[ACPI_STATE_D3].power = 0;
 
-	/* TBD: System wake support and resource requirements. */
-
-	device->power.state = ACPI_STATE_UNKNOWN;
-	acpi_bus_get_power(device->handle, &(device->power.state));
+	acpi_bus_init_power(device);
 
 	return 0;
 }