diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-29 17:30:21 -0400 |
| commit | 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (patch) | |
| tree | df468cdc2d1556fdc24a023baeef4b5274baf702 /drivers/acpi/bus.c | |
| parent | 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff) | |
| parent | 5527c8bee27fa063dcec0e020fb8c242ba4270c2 (diff) | |
| download | linux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.tar.bz2 | |
Pull alexey-fixes into release branch
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) return -ENODEV; } /* - * Get device's current power state if it's unknown - * This means device power state isn't initialized or previous setting failed + * Get device's current power state */ - 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_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; |