diff options
| author | Konstantin Karasyov <konstantin.a.karasyov@intel.com> | 2006-05-08 06:00:00 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-05-15 09:16:45 +0200 |
| commit | 0feabb01d93e5801d1127416a66cfc3963280bca (patch) | |
| tree | 8f8a813abfbc82e9c9e6c0d58de0868be163fa67 /drivers/acpi/bus.c | |
| parent | ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() (diff) | |
| download | linux-0feabb01d93e5801d1127416a66cfc3963280bca.tar.xz linux-0feabb01d93e5801d1127416a66cfc3963280bca.zip | |
ACPI: create acpi_fan_suspend()/acpi_fan_resume()
http://bugzilla.kernel.org/show_bug.cgi?id=5000
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 606f8733a776..eff696f2b6bb 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", |