1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 67dedeed144c..4c9c2fb5d98f 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -213,11 +213,13 @@ static int acpi_power_on(acpi_handle handle)
                                   resource->name));
         } else {
                 result = __acpi_power_on(resource);
+                if (result)
+                        resource->ref_count--;
         }
 
         mutex_unlock(&resource->resource_lock);
 
-        return 0;
+        return result;
 }
 
 static int acpi_power_off_device(acpi_handle handle)
@@ -465,10 +467,12 @@ int acpi_power_transition(struct acpi_device *device, int state)
         struct acpi_handle_list *tl = NULL;     /* Target Resources */
         int i = 0;
 
-
         if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
                 return -EINVAL;
 
+        if (device->power.state == state)
+                return 0;
+
         if ((device->power.state < ACPI_STATE_D0)
             || (device->power.state > ACPI_STATE_D3))
                 return -ENODEV;
@@ -488,10 +492,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
                         goto end;
         }
 
-        if (device->power.state == state) {
-                goto end;
-        }
-
         /*
          * Then we dereference all power resources used in the current list.
          */