diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 00:51:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 00:51:49 -0400 |
| commit | 92634825571d86417941855a8e3189c07aa3c706 (patch) | |
| tree | 92d30f0714607684642487145ff27ca56b59b9e1 /drivers/acpi/acpica/evgpeblk.c | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| parent | 9d3c752de65dbfa6e522f1d666deb0ac152ef367 (diff) | |
Merge branch 'gpe-regression-fixes' into release
Diffstat (limited to 'drivers/acpi/acpica/evgpeblk.c')
| -rw-r--r-- | drivers/acpi/acpica/evgpeblk.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c index 7c28f2d9fd35..341a38ce8aa6 100644 --- a/drivers/acpi/acpica/evgpeblk.c +++ b/drivers/acpi/acpica/evgpeblk.c @@ -500,6 +500,19 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, gpe_index = (i * ACPI_GPE_REGISTER_WIDTH) + j; gpe_event_info = &gpe_block->event_info[gpe_index]; + gpe_number = gpe_index + gpe_block->block_base_number; + + /* + * If the GPE has already been enabled for runtime + * signaling, make sure it remains enabled, but do not + * increment its reference counter. + */ + if (gpe_event_info->runtime_count) { + acpi_set_gpe(gpe_device, gpe_number, + ACPI_GPE_ENABLE); + gpe_enabled_count++; + continue; + } if (gpe_event_info->flags & ACPI_GPE_CAN_WAKE) { wake_gpe_count++; @@ -516,7 +529,6 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, /* Enable this GPE */ - gpe_number = gpe_index + gpe_block->block_base_number; status = acpi_enable_gpe(gpe_device, gpe_number, ACPI_GPE_TYPE_RUNTIME); if (ACPI_FAILURE(status)) { |