diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-23 23:48:46 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-23 23:48:46 -0500 |
| commit | 3645ca8359328ea4c75bce4af54ad24028381f30 (patch) | |
| tree | e66e33eb9d0bbbb66c9788ae44164e9e6b71c8d4 /drivers/acpi/bus.c | |
| parent | 0f23a6b0c182b1040cb0b89e20527cd07d85aebf (diff) | |
| parent | ec68373c04495edbe39fb94fad963fb781e062e5 (diff) | |
| download | linux-3645ca8359328ea4c75bce4af54ad24028381f30.tar.bz2 | |
Pull bugzilla-9798 into release branch
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 d7a115c362d1..f4487c38d9f2 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; |