[PATCH] Revert "ACPI / sleep: pm_power_off needs more sanity checks to be installed"

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

Revert commit 3130497f5bab (ACPI / sleep: pm_power_off needs more
sanity checks to be installed) that breaks power ACPI power off on a
lot of systems, because it checks wrong registers.

Fixes: 3130497f5bab (ACPI / sleep: pm_power_off needs more sanity checks to be installed)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---

Hi Linus,

Can you take this for 3.14-rc6 directly so that the breakage is not present
in that -rc, please?

I obviously trusted the author of commit 3130497f5bab too much which I shouldn't
have done.  My bad and sorry about this mess.

Rafael

---
 drivers/acpi/sleep.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Index: linux-pm/drivers/acpi/sleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/drivers/acpi/sleep.c
@@ -807,12 +807,7 @@ int __init acpi_sleep_init(void)
 	acpi_sleep_hibernate_setup();
 
 	status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
-	/*
-	 * Check both ACPI S5 object and ACPI sleep registers to
-	 * install pm_power_off_prepare/pm_power_off hook
-	 */
-	if (ACPI_SUCCESS(status) && acpi_gbl_FADT.sleep_control.address
-	    && acpi_gbl_FADT.sleep_status.address) {
+	if (ACPI_SUCCESS(status)) {
 		sleep_states[ACPI_STATE_S5] = 1;
 		pm_power_off_prepare = acpi_power_off_prepare;
 		pm_power_off = acpi_power_off;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/