diff options
Diffstat (limited to 'drivers/acpi/executer/exresnte.c')
-rw-r--r-- | drivers/acpi/executer/exresnte.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c index f9b9f5008596..3089b05a1368 100644 --- a/drivers/acpi/executer/exresnte.c +++ b/drivers/acpi/executer/exresnte.c | |||
@@ -114,10 +114,11 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, | |||
114 | 114 | ||
115 | /* | 115 | /* |
116 | * Several object types require no further processing: | 116 | * Several object types require no further processing: |
117 | * 1) Devices rarely have an attached object, return the Node | 117 | * 1) Device/Thermal objects don't have a "real" subobject, return the Node |
118 | * 2) Method locals and arguments have a pseudo-Node | 118 | * 2) Method locals and arguments have a pseudo-Node |
119 | */ | 119 | */ |
120 | if (entry_type == ACPI_TYPE_DEVICE || | 120 | if ((entry_type == ACPI_TYPE_DEVICE) || |
121 | (entry_type == ACPI_TYPE_THERMAL) || | ||
121 | (node->flags & (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) { | 122 | (node->flags & (ANOBJ_METHOD_ARG | ANOBJ_METHOD_LOCAL))) { |
122 | return_ACPI_STATUS(AE_OK); | 123 | return_ACPI_STATUS(AE_OK); |
123 | } | 124 | } |
@@ -216,7 +217,6 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, | |||
216 | case ACPI_TYPE_METHOD: | 217 | case ACPI_TYPE_METHOD: |
217 | case ACPI_TYPE_POWER: | 218 | case ACPI_TYPE_POWER: |
218 | case ACPI_TYPE_PROCESSOR: | 219 | case ACPI_TYPE_PROCESSOR: |
219 | case ACPI_TYPE_THERMAL: | ||
220 | case ACPI_TYPE_EVENT: | 220 | case ACPI_TYPE_EVENT: |
221 | case ACPI_TYPE_REGION: | 221 | case ACPI_TYPE_REGION: |
222 | 222 | ||