diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-27 16:42:42 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-27 16:42:42 +0400 |
| commit | 45c36462aef0cccadb7755ea4edc78d13334a2be (patch) | |
| tree | d707b2863494452585941d3818347005f34c636e /drivers/acpi/scan.c | |
| parent | c4e050376c69bb9d67895842665264df2a2004d9 (diff) | |
| parent | b88ce2a41562d1a9554f209e0f31a32d9f473794 (diff) | |
| download | linux-45c36462aef0cccadb7755ea4edc78d13334a2be.tar.xz | |
Merge branch 'acpi-dev-pm' into acpi-enumeration
Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 671bbe68b96c..d59a60736e1c 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1006,8 +1006,10 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) * D3hot is only valid if _PR3 present. */ if (ps->resources.count || - (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT)) + (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT)) { ps->flags.valid = 1; + ps->flags.os_accessible = 1; + } ps->power = -1; /* Unknown - driver assigned */ ps->latency = -1; /* Unknown - driver assigned */ @@ -1023,6 +1025,11 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set) device->power.states[ACPI_STATE_D3_COLD].flags.explicit_set = 1; + /* Presence of _PS3 or _PRx means we can put the device into D3 cold */ + if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set || + device->power.flags.power_resources) + device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible = 1; + acpi_bus_init_power(device); return 0; |