[PATCH] Touchpad stops working after suspend

[Adam Guthrie]

Hello,

I would like to propose that the following patch be included in the
Ubuntu Feisty kernel. Ref. Ubuntu bug 59867 [0] and kernel.org bug 7977
[1]. This is a regression since 2.6.19, according to the kernel.org bug.

This patch (and a whitespace change) are the only change to hwsleep.c
since 2.6.20 branched.

diff --git a/drivers/acpi/hardware/hwsleep.c
b/drivers/acpi/hardware/hwsleep.c
index 8bb43ca..df91570 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -204,6 +204,14 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
                                "While executing method _SST"));
        }

+       /*
+        * 1) Disable/Clear all GPEs
+        */
+       status = acpi_hw_disable_all_gpes();
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
        return_ACPI_STATUS(AE_OK);
 }

@@ -260,13 +268,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8
sleep_state)
        }

        /*
-        * 1) Disable/Clear all GPEs
         * 2) Enable all wakeup GPEs
         */
        status = acpi_hw_disable_all_gpes();
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
        }
+
        acpi_gbl_system_awake_and_running = FALSE;

        status = acpi_hw_enable_all_wakeup_gpes();

Regards,
Adam Guthrie

[0] https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.20/+bug/59867
[1] http://bugzilla.kernel.org/show_bug.cgi?id=7977