diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-11-25 00:08:36 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:48:44 -0500 |
| commit | ade3e7fef794781c0798d0cf0f046123842ba550 (patch) | |
| tree | da022d17787e9b79012fae0fabf6e7bf612b3edd /drivers/acpi/scan.c | |
| parent | 5e6d4fe4296782f1f095575b8213a97c3e925a16 (diff) | |
ACPI / PM: Add function for device power state initialization
Add function acpi_bus_init_power() for getting the initial power
state of an ACPI device and reference counting its power resources
as appropriate.
Make acpi_bus_get_power_flags() use the new function instead of
acpi_bus_get_power() that updates device->power.state without
reference counting the device's power resources.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 29ef505c487..ef8e659771e 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -901,10 +901,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) device->power.states[ACPI_STATE_D3].flags.valid = 1; device->power.states[ACPI_STATE_D3].power = 0; - /* TBD: System wake support and resource requirements. */ - - device->power.state = ACPI_STATE_UNKNOWN; - acpi_bus_get_power(device->handle, &(device->power.state)); + acpi_bus_init_power(device); return 0; } |