1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 330bb4d75852..0500f719f63e 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -660,7 +660,7 @@ int acpi_power_on_resources(struct acpi_device *device, int state)
 
 int acpi_power_transition(struct acpi_device *device, int state)
 {
-        int result;
+        int result = 0;
 
         if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
                 return -EINVAL;
@@ -679,8 +679,11 @@ int acpi_power_transition(struct acpi_device *device, int state)
          * (e.g. so the device doesn't lose power while transitioning).  Then,
          * we dereference all power resources used in the current list.
          */
-        result = acpi_power_on_list(&device->power.states[state].resources);
-        if (!result)
+        if (state < ACPI_STATE_D3_COLD)
+                result = acpi_power_on_list(
+                        &device->power.states[state].resources);
+
+        if (!result && device->power.state < ACPI_STATE_D3_COLD)
                 acpi_power_off_list(
                         &device->power.states[device->power.state].resources);