diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-11-24 18:11:24 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:48:45 -0500 |
commit | 488a76c52606199100adf09c8eb7cbedbd94e9d9 (patch) | |
tree | bd5c7f8b546f881936d9c72989de7046c39fd755 /drivers/acpi/bus.c | |
parent | bf325f9538d8c89312be305b9779edbcb436af00 (diff) |
ACPI / Fan: Rework the handling of power resources
Use the new function acpi_bus_update_power() for manipulating power
resources used by ACPI fan devices, which allows them to be put into
the right state during initialization and resume. Consequently,
remove the flags.force_power_state field from struct acpi_device,
which is not necessary any more.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
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 47864013c0df..2ee83b5fff97 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -266,7 +266,7 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state) | |||
266 | 266 | ||
267 | /* Make sure this is a valid target state */ | 267 | /* Make sure this is a valid target state */ |
268 | 268 | ||
269 | if ((state == device->power.state) && !device->flags.force_power_state) { | 269 | if (state == device->power.state) { |
270 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", | 270 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", |
271 | state)); | 271 | state)); |
272 | return 0; | 272 | return 0; |