Pull bugzilla-5000 into release branch

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b77f03d51f0b..dd3983cece92 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -205,12 +205,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->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_VALUE(0);
+        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_VALUE(0);
+                }
         }
         if (!device->power.states[state].flags.valid) {
                 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Device does not support D%d\n",