diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-23 22:41:20 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-23 22:41:20 -0500 |
| commit | ec68373c04495edbe39fb94fad963fb781e062e5 (patch) | |
| tree | 0c4d57c848de4a41968f61a22b3159dc9092b05a /drivers/acpi/bus.c | |
| parent | 667984d9e481e43a930a478c588dced98cb61fea (diff) | |
| download | kernel-crypto-ec68373c04495edbe39fb94fad963fb781e062e5.tar.gz kernel-crypto-ec68373c04495edbe39fb94fad963fb781e062e5.tar.xz kernel-crypto-ec68373c04495edbe39fb94fad963fb781e062e5.zip | |
Revert "ACPI: Fan: Drop force_power_state acpi_device option"
This reverts commit 93ad7c07ad487b036add8760dabcc35666a550ef.
http://bugzilla.kernel.org/show_bug.cgi?id=9798
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index d7a115c362d..f4487c38d9f 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -200,7 +200,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) { + if ((state == device->power.state) && !device->flags.force_power_state) { ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", state)); return 0; |