Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24

[karo-tx-linux.git] / drivers / acpi / bus.c

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index fdee82d37b7dd04ffdecf8ec7b0105560da37d25..49d432d0a12c6d7682b5325015f6612124058d19 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -201,7 +201,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
         * Get device's current power state
         */
        acpi_bus_get_power(device->handle, &device->power.state);
-       if ((state == device->power.state) && !device->flags.force_power_state) {
+       if (state == device->power.state) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
                                  state));
                return 0;