diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
| commit | ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d (patch) | |
| tree | 67e4709b760582bdca00e596a2ea68bafb4ccc09 /drivers/acpi/scan.c | |
| parent | 73f05330497b98c45d157b7d0c60673798bb4c3b (diff) | |
| parent | b24e5098853653554baf6ec975b9e855f3d6e5c0 (diff) | |
| download | op-kernel-dev-ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d.zip op-kernel-dev-ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d.tar.gz | |
Merge branch 'd3' into release
Conflicts:
drivers/acpi/sleep.c
This was a text conflict between
a2ef5c4fd44ce3922435139393b89f2cce47f576
(ACPI: Move module parameter gts and bfs to sleep.c)
which added #include <linux/module.h>
and
b24e5098853653554baf6ec975b9e855f3d6e5c0
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)
which added #include <linux/pm_runtime.h>
The resolution was to take them both.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 5d24a17..767e2dc 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -884,6 +884,13 @@ static int acpi_bus_get_power_flags(struct acpi_device *device) acpi_bus_add_power_resource(ps->resources.handles[j]); } + /* The exist of _PR3 indicates D3Cold support */ + if (i == ACPI_STATE_D3) { + status = acpi_get_handle(device->handle, object_name, &handle); + if (ACPI_SUCCESS(status)) + device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1; + } + /* Evaluate "_PSx" to see if we can do explicit sets */ object_name[2] = 'S'; status = acpi_get_handle(device->handle, object_name, &handle); |
