From 8ce1c8ac5878aba53e95cd836838ff7177a0c39b Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Tue, 22 Jan 2013 12:56:35 +0100
Subject: [PATCH] --- yaml --- r: 350936 b: refs/heads/master c:
 e5656271b0221a53e9f74856385112fdcec0dd60 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/device_pm.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af0294a837dd..c3ce89b84e01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 898fee4f6ed52b5b5dd159b221d2ad7ce40ae2dd
+refs/heads/master: e5656271b0221a53e9f74856385112fdcec0dd60
diff --git a/trunk/drivers/acpi/device_pm.c b/trunk/drivers/acpi/device_pm.c
index 61ae99b09f1c..4cbc9505b365 100644
--- a/trunk/drivers/acpi/device_pm.c
+++ b/trunk/drivers/acpi/device_pm.c
@@ -264,8 +264,11 @@ int acpi_device_set_power(struct acpi_device *device, int state)
 	if (result)
 		goto end;
 
-	if (cut_power)
-		result = acpi_power_transition(device, ACPI_STATE_D3_COLD);
+	if (cut_power) {
+		device->power.state = state;
+		state = ACPI_STATE_D3_COLD;
+		result = acpi_power_transition(device, state);
+	}
 
  end:
 	if (result) {