aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-03-09 23:19:50 -0500
committerLen Brown <len.brown@intel.com>2007-03-09 23:19:50 -0500
commit63e34ca93a62f472144db60fa3b81111c0d15721 (patch)
tree2137a4b98360833e78cbb8edd5dce5b2ab5a0a60 /drivers/acpi/power.c
parent51e7fff1c2b763da910db3a875eac5b992df91d9 (diff)
parent9327f46ee28116b17f15f6505edd90f905908d62 (diff)
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c7
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)
688 return result; 688 return result;
689 689
690 mutex_lock(&resource->resource_lock); 690 mutex_lock(&resource->resource_lock);
691 if ((resource->state == ACPI_POWER_RESOURCE_STATE_ON) &&
692 list_empty(&resource->reference)) {
693 mutex_unlock(&resource->resource_lock);
694 result = acpi_power_off_device(device->handle, NULL);
695 return result;
696 }
697
698 if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) && 691 if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) &&
699 !list_empty(&resource->reference)) { 692 !list_empty(&resource->reference)) {
700 ref = container_of(resource->reference.next, struct acpi_power_reference, node); 693 ref = container_of(resource->reference.next, struct acpi_power_reference, node);