Skip to content

Commit

Permalink
ACPICA: Events: Reduce source code difference in acpi_install_gpe_han…
Browse files Browse the repository at this point in the history
…dler().

There is a sanity check in ACPICA upstream, complaining mis-matched
interrupt type for originally enabled GPEs that are going to be dispatched
by OSPM handlers. This is only a warning message noting developers such
conflict between BIOS and OSPM. This patch ports this warning message from
ACPICA upstream to reduce source code difference between Linux and ACPICA
upstream.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Lv Zheng authored and Rafael J. Wysocki committed Oct 20, 2014
1 parent f19f1a7 commit 437b751
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/acpi/acpica/evxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -795,8 +795,16 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
*/
if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
&& gpe_event_info->runtime_count) {
handler->originally_enabled = 1;
handler->originally_enabled = TRUE;
(void)acpi_ev_remove_gpe_reference(gpe_event_info);

/* Sanity check of original type against new type */

if (type !=
(u32)(gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK)) {
ACPI_WARNING((AE_INFO,
"GPE type mismatch (level/edge)"));
}
}

/* Install the handler */
Expand Down

0 comments on commit 437b751

Please sign in to comment.