Pull bugzilla-7570 into release branch

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index fd37e19360d0..0c93cd400ddb 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -199,15 +199,14 @@ int acpi_bus_set_power(acpi_handle handle, int state)
          * Get device's current power state if it's unknown
          * This means device power state isn't initialized or previous setting failed
          */
-        if (!device->flags.force_power_state) {
-                if (device->power.state == ACPI_STATE_UNKNOWN)
-                        acpi_bus_get_power(device->handle, &device->power.state);
-                if (state == device->power.state) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
-                                          state));
-                        return 0;
-                }
+        if ((device->power.state == ACPI_STATE_UNKNOWN) || device->flags.force_power_state)
+                acpi_bus_get_power(device->handle, &device->power.state);
+        if ((state == device->power.state) && !device->flags.force_power_state) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
+                                  state));
+                return 0;
         }
+
         if (!device->power.states[state].flags.valid) {
                 printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
                 return -ENODEV;