projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPICA: Regression fix: reinstate safe exit macros
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
acpica
/
hwacpi.c
diff --git
a/drivers/acpi/acpica/hwacpi.c
b/drivers/acpi/acpica/hwacpi.c
index 9b02a9f5b04a01e90cfc6aea5402707f06da8dc4..579c3a53ac87ede953e7610dab23f1270c6bafcc 100644
(file)
--- a/
drivers/acpi/acpica/hwacpi.c
+++ b/
drivers/acpi/acpica/hwacpi.c
@@
-155,7
+155,7
@@
u32 acpi_hw_get_mode(void)
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
- return_
VALUE
(ACPI_SYS_MODE_ACPI);
+ return_
UINT32
(ACPI_SYS_MODE_ACPI);
}
/*
}
/*
@@
-163,18
+163,18
@@
u32 acpi_hw_get_mode(void)
* system does not support mode transition.
*/
if (!acpi_gbl_FADT.smi_command) {
* system does not support mode transition.
*/
if (!acpi_gbl_FADT.smi_command) {
- return_
VALUE
(ACPI_SYS_MODE_ACPI);
+ return_
UINT32
(ACPI_SYS_MODE_ACPI);
}
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
if (ACPI_FAILURE(status)) {
}
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
if (ACPI_FAILURE(status)) {
- return_
VALUE
(ACPI_SYS_MODE_LEGACY);
+ return_
UINT32
(ACPI_SYS_MODE_LEGACY);
}
if (value) {
}
if (value) {
- return_
VALUE
(ACPI_SYS_MODE_ACPI);
+ return_
UINT32
(ACPI_SYS_MODE_ACPI);
} else {
} else {
- return_
VALUE
(ACPI_SYS_MODE_LEGACY);
+ return_
UINT32
(ACPI_SYS_MODE_LEGACY);
}
}
}
}