diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:54 -0500 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /drivers/acpi/acpica | |
| parent | 56f4c400349157289b474a3fd49ee96acab0a4d7 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/evgpeinit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evgpeinit.c b/drivers/acpi/acpica/evgpeinit.c index 2c7def95f721..4c8dea513b66 100644 --- a/drivers/acpi/acpica/evgpeinit.c +++ b/drivers/acpi/acpica/evgpeinit.c | |||
| @@ -408,6 +408,9 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle, | |||
| 408 | return_ACPI_STATUS(AE_OK); | 408 | return_ACPI_STATUS(AE_OK); |
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | /* Disable the GPE in case it's been enabled already. */ | ||
| 412 | (void)acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE); | ||
| 413 | |||
| 411 | /* | 414 | /* |
| 412 | * Add the GPE information from above to the gpe_event_info block for | 415 | * Add the GPE information from above to the gpe_event_info block for |
| 413 | * use during dispatch of this GPE. | 416 | * use during dispatch of this GPE. |