diff options
author | Bob Moore <robert.moore@intel.com> | 2013-03-08 04:22:23 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-11 19:45:04 -0400 |
commit | fd1af7126fb62688cfcf4b563c73b2909ac30f74 (patch) | |
tree | f3f1437c28c49da167389868ab047fa43b2eefa1 /drivers/acpi/acpica/evgpe.c | |
parent | c39660b232c5e4aee3cded5a02d28e71ca447fb8 (diff) |
ACPICA: Regression fix: reinstate safe exit macros
Removal caused a regression on at least FreeBSD. This fix
reinstates the macros.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/evgpe.c')
-rw-r--r-- | drivers/acpi/acpica/evgpe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index b9adb9a7ed85..a493b528f8f9 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c | |||
@@ -707,7 +707,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, | |||
707 | if (ACPI_FAILURE(status)) { | 707 | if (ACPI_FAILURE(status)) { |
708 | ACPI_EXCEPTION((AE_INFO, status, | 708 | ACPI_EXCEPTION((AE_INFO, status, |
709 | "Unable to clear GPE%02X", gpe_number)); | 709 | "Unable to clear GPE%02X", gpe_number)); |
710 | return_VALUE(ACPI_INTERRUPT_NOT_HANDLED); | 710 | return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); |
711 | } | 711 | } |
712 | } | 712 | } |
713 | 713 | ||
@@ -724,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, | |||
724 | if (ACPI_FAILURE(status)) { | 724 | if (ACPI_FAILURE(status)) { |
725 | ACPI_EXCEPTION((AE_INFO, status, | 725 | ACPI_EXCEPTION((AE_INFO, status, |
726 | "Unable to disable GPE%02X", gpe_number)); | 726 | "Unable to disable GPE%02X", gpe_number)); |
727 | return_VALUE(ACPI_INTERRUPT_NOT_HANDLED); | 727 | return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); |
728 | } | 728 | } |
729 | 729 | ||
730 | /* | 730 | /* |
@@ -784,7 +784,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, | |||
784 | break; | 784 | break; |
785 | } | 785 | } |
786 | 786 | ||
787 | return_VALUE(ACPI_INTERRUPT_HANDLED); | 787 | return_UINT32(ACPI_INTERRUPT_HANDLED); |
788 | } | 788 | } |
789 | 789 | ||
790 | #endif /* !ACPI_REDUCED_HARDWARE */ | 790 | #endif /* !ACPI_REDUCED_HARDWARE */ |