summaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/nsutils.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-03-08 13:22:23 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-12 03:45:04 +0400
commitfd1af7126fb62688cfcf4b563c73b2909ac30f74 (patch)
treef3f1437c28c49da167389868ab047fa43b2eefa1 /drivers/acpi/acpica/nsutils.c
parentc39660b232c5e4aee3cded5a02d28e71ca447fb8 (diff)
downloadlinux-fd1af7126fb62688cfcf4b563c73b2909ac30f74.tar.xz
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/nsutils.c')
-rw-r--r--drivers/acpi/acpica/nsutils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 686420df684f..2808586fad30 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -112,10 +112,10 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
if (!node) {
ACPI_WARNING((AE_INFO, "Null Node parameter"));
- return_VALUE(ACPI_TYPE_ANY);
+ return_UINT8(ACPI_TYPE_ANY);
}
- return_VALUE(node->type);
+ return_UINT8(node->type);
}
/*******************************************************************************
@@ -140,10 +140,10 @@ u32 acpi_ns_local(acpi_object_type type)
/* Type code out of range */
ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type));
- return_VALUE(ACPI_NS_NORMAL);
+ return_UINT32(ACPI_NS_NORMAL);
}
- return_VALUE(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
+ return_UINT32(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
}
/*******************************************************************************