Merge branch 'bugzilla-15951' into release

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index fd51c4ab4829..7d857dabdde4 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -425,7 +425,7 @@ static int acpi_button_add(struct acpi_device *device)
                 /* Button's GPE is run-wake GPE */
                 acpi_enable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number,
-                                ACPI_GPE_TYPE_WAKE_RUN);
+                                ACPI_GPE_TYPE_RUNTIME);
                 device->wakeup.run_wake_count++;
                 device->wakeup.state.enabled = 1;
         }
@@ -449,7 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
         if (device->wakeup.flags.valid) {
                 acpi_disable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number,
-                                ACPI_GPE_TYPE_WAKE_RUN);
+                                ACPI_GPE_TYPE_RUNTIME);
                 device->wakeup.run_wake_count--;
                 device->wakeup.state.enabled = 0;
         }