diff options
| author |   Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-03-09 23:19:50 -0500 |
| commit | 63e34ca93a62f472144db60fa3b81111c0d15721 (patch) | |
| tree | 2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /drivers/acpi/power.c | |
| parent | Pull bugzilla-8110 into release branch (diff) | |
| parent | ACPI: Kconfig: hide ACPI menu when CONFIG_PM=n (diff) | |
| download | linux-dev-63e34ca93a62f472144db60fa3b81111c0d15721.tar.xz linux-dev-63e34ca93a62f472144db60fa3b81111c0d15721.zip | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 547eee7537bc..4ffecd179702 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -688,13 +688,6 @@ static int acpi_power_resume(struct acpi_device *device) return result; mutex_lock(&resource->resource_lock); - if ((resource->state == ACPI_POWER_RESOURCE_STATE_ON) && - list_empty(&resource->reference)) { - mutex_unlock(&resource->resource_lock); - result = acpi_power_off_device(device->handle, NULL); - return result; - } - if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) && !list_empty(&resource->reference)) { ref = container_of(resource->reference.next, struct acpi_power_reference, node); |