---

yaml --- r: 350936 b: refs/heads/master c: e565627 h: refs/heads/master v: v3
git-mirror · Jan 22, 2013 · 8ce1c8a · 8ce1c8a
1 parent 298c04c
commit 8ce1c8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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) {