diff options
-rw-r--r-- | drivers/acpi/acpica/nsrepair.c | 5 | ||||
-rw-r--r-- | drivers/acpi/acpica/nsrepair2.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c index 907f60c9c9e..4fd1bdb056b 100644 --- a/drivers/acpi/acpica/nsrepair.c +++ b/drivers/acpi/acpica/nsrepair.c | |||
@@ -399,6 +399,11 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, | |||
399 | break; | 399 | break; |
400 | 400 | ||
401 | case ACPI_TYPE_PACKAGE: | 401 | case ACPI_TYPE_PACKAGE: |
402 | /* | ||
403 | * This case is often seen for predefined names that must return a | ||
404 | * Buffer object with multiple DWORD integers within. For example, | ||
405 | * _FDE and _GTM. The Package can be converted to a Buffer. | ||
406 | */ | ||
402 | 407 | ||
403 | /* All elements of the Package must be integers */ | 408 | /* All elements of the Package must be integers */ |
404 | 409 | ||
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c index 199333880c8..e7373eb6cfa 100644 --- a/drivers/acpi/acpica/nsrepair2.c +++ b/drivers/acpi/acpica/nsrepair2.c | |||
@@ -111,8 +111,8 @@ acpi_ns_sort_list(union acpi_operand_object **elements, | |||
111 | * As necessary: | 111 | * As necessary: |
112 | * | 112 | * |
113 | * _ALR: Sort the list ascending by ambient_illuminance | 113 | * _ALR: Sort the list ascending by ambient_illuminance |
114 | * _FDE: Convert a Package or Buffer of BYTEs to a Buffer of DWORDs | 114 | * _FDE: Convert Buffer of BYTEs to a Buffer of DWORDs |
115 | * _GTM: Convert a Package or Buffer of BYTEs to a Buffer of DWORDs | 115 | * _GTM: Convert Buffer of BYTEs to a Buffer of DWORDs |
116 | * _PSS: Sort the list descending by Power | 116 | * _PSS: Sort the list descending by Power |
117 | * _TSS: Sort the list descending by Power | 117 | * _TSS: Sort the list descending by Power |
118 | */ | 118 | */ |
@@ -238,10 +238,9 @@ acpi_ns_repair_ALR(struct acpi_predefined_data *data, | |||
238 | * RETURN: Status. AE_OK if object is OK or was repaired successfully | 238 | * RETURN: Status. AE_OK if object is OK or was repaired successfully |
239 | * | 239 | * |
240 | * DESCRIPTION: Repair for the _FDE and _GTM objects. The expected return | 240 | * DESCRIPTION: Repair for the _FDE and _GTM objects. The expected return |
241 | * value is a Buffer of 5 DWORDs. This function repairs two | 241 | * value is a Buffer of 5 DWORDs. This function repairs a common |
242 | * possible problems: | 242 | * problem where the return value is a Buffer of BYTEs, not |
243 | * 1) The return value is a Buffer of BYTEs, not DWORDs | 243 | * DWORDs. |
244 | * 2) The return value is a Package of Integer objects | ||
245 | * | 244 | * |
246 | *****************************************************************************/ | 245 | *****************************************************************************/ |
247 | 246 | ||