diff options
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index fb2cff9a2d24..49d432d0a12c 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -198,12 +198,10 @@ int acpi_bus_set_power(acpi_handle handle, int state) | |||
| 198 | return -ENODEV; | 198 | return -ENODEV; |
| 199 | } | 199 | } |
| 200 | /* | 200 | /* |
| 201 | * Get device's current power state if it's unknown | 201 | * Get device's current power state |
| 202 | * This means device power state isn't initialized or previous setting failed | ||
| 203 | */ | 202 | */ |
| 204 | if ((device->power.state == ACPI_STATE_UNKNOWN) || device->flags.force_power_state) | 203 | acpi_bus_get_power(device->handle, &device->power.state); |
| 205 | acpi_bus_get_power(device->handle, &device->power.state); | 204 | if (state == device->power.state) { |
| 206 | if ((state == device->power.state) && !device->flags.force_power_state) { | ||
| 207 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", | 205 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", |
| 208 | state)); | 206 | state)); |
| 209 | return 0; | 207 | return 0; |