Merge git://git.infradead.org/mtd-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / pci / pci-acpi.c

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 1ab98bbe58dd0e0d30cd328d8e5f9c93d32bf1d9..24e19c594e57abe55aa284054bde746606863694 100644 (file)
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -296,14 +296,12 @@ static int acpi_dev_run_wake(struct device *phys_dev, bool enable)
                if (!dev->wakeup.run_wake_count++) {
                        acpi_enable_wakeup_device_power(dev, ACPI_STATE_S0);
                        acpi_enable_gpe(dev->wakeup.gpe_device,
-                                       dev->wakeup.gpe_number,
-                                       ACPI_GPE_TYPE_RUNTIME);
+                                       dev->wakeup.gpe_number);
                }
        } else if (dev->wakeup.run_wake_count > 0) {
                if (!--dev->wakeup.run_wake_count) {
                        acpi_disable_gpe(dev->wakeup.gpe_device,
-                                        dev->wakeup.gpe_number,
-                                        ACPI_GPE_TYPE_RUNTIME);
+                                        dev->wakeup.gpe_number);
                        acpi_disable_wakeup_device_power(dev);
                }
        } else {