aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Karasyov <konstantin.a.karasyov@intel.com>2007-03-07 03:50:11 -0500
committerLen Brown <len.brown@intel.com>2007-03-07 03:50:11 -0500
commitff24ba74b6d3befbfbafa142582211b5a6095d45 (patch)
treed12ecd366cf81772071bf5b26d8d77617f8aa20e
parent03d926f82800f32642b32ba547c7a002a371a78f (diff)
ACPI: ThinkPad Z60m: usb mouse stops working after suspend to RAM
(http://www.mail-archive.com/linux-acpi@vger.kernel.org/msg05270.html): References : http://lkml.org/lkml/2007/2/21/413 http://lkml.org/lkml/2007/2/28/172 Submitter : Arkadiusz Miskiewicz <arekm@maven.pl> Caused-By : Konstantin Karasyov <konstantin.a.karasyov@intel.com> commit 0a6139027f3986162233adc17285151e78b39cac Do not disable power resources on resume even if there are no devices referencing it. Signed-off-by: Konstantin Karasyov <konstantin.a.karasyov@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-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 1ef338545dfe..ccecfe0d695c 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -687,13 +687,6 @@ static int acpi_power_resume(struct acpi_device *device)
687 return result; 687 return result;
688 688
689 mutex_lock(&resource->resource_lock); 689 mutex_lock(&resource->resource_lock);
690 if ((resource->state == ACPI_POWER_RESOURCE_STATE_ON) &&
691 list_empty(&resource->reference)) {
692 mutex_unlock(&resource->resource_lock);
693 result = acpi_power_off_device(device->handle, NULL);
694 return result;
695 }
696
697 if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) && 690 if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) &&
698 !list_empty(&resource->reference)) { 691 !list_empty(&resource->reference)) {
699 ref = container_of(resource->reference.next, struct acpi_power_reference, node); 692 ref = container_of(resource->reference.next, struct acpi_power_reference, node);