[PATCH] ACPI: Revert commit faee816b150238 due to regression

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Rafael J. Wysocki <rjw@xxxxxxx>
Subject: ACPI: Revert commit faee816b150238 due to regression

Commit faee816b1502385dc9bc5abf2960d1cc645844d1
"ACPI: don't enable control method power button as wakeup device
when Fixed Power button is used" caused the regression tracked
as http://bugzilla.kernel.org/show_bug.cgi?id=12091 (there are no
AC adapter events on Toshiba Portege R500) and the problem this
commit was intended to fix can be fixed differently.

For this reason, the author of the commit, Zhang Rui, has requested
that it be reverted.

Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
---
 drivers/acpi/scan.c |   10 ----------
 1 file changed, 10 deletions(-)

Index: linux-2.6/drivers/acpi/scan.c
===================================================================
--- linux-2.6.orig/drivers/acpi/scan.c
+++ linux-2.6/drivers/acpi/scan.c
@@ -751,16 +751,6 @@ static int acpi_bus_get_wakeup_device_fl
 	if (!acpi_match_device_ids(device, button_device_ids))
 		device->wakeup.flags.run_wake = 1;
 
-	/*
-	 * Don't set Power button GPE as run_wake
-	 * if Fixed Power button is used
-	 */
-	if (!strcmp(device->pnp.hardware_id, "PNP0C0C") &&
-		!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {
-		device->wakeup.flags.run_wake = 0;
-		device->wakeup.flags.valid = 0;
-	}
-
       end:
 	if (ACPI_FAILURE(status))
 		device->flags.wake_capable = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux