diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-26 23:37:57 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-26 23:37:57 +0300 |
| commit | cf2394f70cf7774a107fbaa1ef5010db4bd69baa (patch) | |
| tree | e79e3e479d04213a67ecd47b31c7db648b0313c2 /drivers/acpi/acpica/evgpeinit.c | |
| parent | 45fc84c668ba6cc08cbae74042be838bf9283d98 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
| download | linux-cf2394f70cf7774a107fbaa1ef5010db4bd69baa.tar.xz | |
Merge tag 'v3.18-rc4' into regulator-max77802
Linux 3.18-rc4
Diffstat (limited to 'drivers/acpi/acpica/evgpeinit.c')
| -rw-r--r-- | drivers/acpi/acpica/evgpeinit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c index 49fc7effd961..7be928379879 100644 --- a/drivers/acpi/acpica/evgpeinit.c +++ b/drivers/acpi/acpica/evgpeinit.c @@ -424,6 +424,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle, } /* Disable the GPE in case it's been enabled already. */ + (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE); /* |