Merge branch 'acpica-gpe' into release

[net-next-2.6.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index e4625f9198143bfd645d8d2bf644e0c6ec9582c1..cf82989ae7568c3c54ded69d16829a2851119d80 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -646,18 +646,9 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
                return -ENODEV;
        }
 
-       if (enable) {
-               error = acpi_enable_wakeup_device_power(adev,
-                                               acpi_target_sleep_state);
-               if (!error)
-                       acpi_enable_gpe(adev->wakeup.gpe_device,
-                                       adev->wakeup.gpe_number,
-                                       ACPI_GPE_TYPE_WAKE);
-       } else {
-               acpi_disable_gpe(adev->wakeup.gpe_device, adev->wakeup.gpe_number,
-                               ACPI_GPE_TYPE_WAKE);
-               error = acpi_disable_wakeup_device_power(adev);
-       }
+       error = enable ?
+               acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
+               acpi_disable_wakeup_device_power(adev);
        if (!error)
                dev_info(dev, "wake-up capability %s by ACPI\n",
                                enable ? "enabled" : "disabled");