]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ACPI: ThinkPad Z60m: usb mouse stops working after suspend to RAM
authorKonstantin Karasyov <konstantin.a.karasyov@intel.com>
Wed, 7 Mar 2007 08:50:11 +0000 (03:50 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 7 Mar 2007 08:50:11 +0000 (03:50 -0500)
(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>
drivers/acpi/power.c

index 1ef338545dfef977034a490d56ae9c5f043eb948..ccecfe0d695caf577367b585787fe8c4336a6214 100644 (file)
@@ -687,13 +687,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);