aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/hwacpi.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-03-08 04:22:23 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-03-11 19:45:04 -0400
commitfd1af7126fb62688cfcf4b563c73b2909ac30f74 (patch)
treef3f1437c28c49da167389868ab047fa43b2eefa1 /drivers/acpi/acpica/hwacpi.c
parentc39660b232c5e4aee3cded5a02d28e71ca447fb8 (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/hwacpi.c')
-rw-r--r--drivers/acpi/acpica/hwacpi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 9b02a9f5b04a..579c3a53ac87 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -155,7 +155,7 @@ u32 acpi_hw_get_mode(void)
155 /* If the Hardware Reduced flag is set, machine is always in acpi mode */ 155 /* If the Hardware Reduced flag is set, machine is always in acpi mode */
156 156
157 if (acpi_gbl_reduced_hardware) { 157 if (acpi_gbl_reduced_hardware) {
158 return_VALUE(ACPI_SYS_MODE_ACPI); 158 return_UINT32(ACPI_SYS_MODE_ACPI);
159 } 159 }
160 160
161 /* 161 /*
@@ -163,18 +163,18 @@ u32 acpi_hw_get_mode(void)
163 * system does not support mode transition. 163 * system does not support mode transition.
164 */ 164 */
165 if (!acpi_gbl_FADT.smi_command) { 165 if (!acpi_gbl_FADT.smi_command) {
166 return_VALUE(ACPI_SYS_MODE_ACPI); 166 return_UINT32(ACPI_SYS_MODE_ACPI);
167 } 167 }
168 168
169 status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value); 169 status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
170 if (ACPI_FAILURE(status)) { 170 if (ACPI_FAILURE(status)) {
171 return_VALUE(ACPI_SYS_MODE_LEGACY); 171 return_UINT32(ACPI_SYS_MODE_LEGACY);
172 } 172 }
173 173
174 if (value) { 174 if (value) {
175 return_VALUE(ACPI_SYS_MODE_ACPI); 175 return_UINT32(ACPI_SYS_MODE_ACPI);
176 } else { 176 } else {
177 return_VALUE(ACPI_SYS_MODE_LEGACY); 177 return_UINT32(ACPI_SYS_MODE_LEGACY);
178 } 178 }
179} 179}
180 180