diff options
Diffstat (limited to 'drivers/acpi/acpica/nsparse.c')
-rw-r--r-- | drivers/acpi/acpica/nsparse.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c index f631a47724f0..1783cd7e1446 100644 --- a/drivers/acpi/acpica/nsparse.c +++ b/drivers/acpi/acpica/nsparse.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include "acparser.h" | 47 | #include "acparser.h" |
48 | #include "acdispat.h" | 48 | #include "acdispat.h" |
49 | #include "actables.h" | 49 | #include "actables.h" |
50 | #include "acinterp.h" | ||
50 | 51 | ||
51 | #define _COMPONENT ACPI_NAMESPACE | 52 | #define _COMPONENT ACPI_NAMESPACE |
52 | ACPI_MODULE_NAME("nsparse") | 53 | ACPI_MODULE_NAME("nsparse") |
@@ -170,6 +171,8 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) | |||
170 | 171 | ||
171 | ACPI_FUNCTION_TRACE(ns_parse_table); | 172 | ACPI_FUNCTION_TRACE(ns_parse_table); |
172 | 173 | ||
174 | acpi_ex_enter_interpreter(); | ||
175 | |||
173 | /* | 176 | /* |
174 | * AML Parse, pass 1 | 177 | * AML Parse, pass 1 |
175 | * | 178 | * |
@@ -185,7 +188,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) | |||
185 | status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, | 188 | status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS1, |
186 | table_index, start_node); | 189 | table_index, start_node); |
187 | if (ACPI_FAILURE(status)) { | 190 | if (ACPI_FAILURE(status)) { |
188 | return_ACPI_STATUS(status); | 191 | goto error_exit; |
189 | } | 192 | } |
190 | 193 | ||
191 | /* | 194 | /* |
@@ -201,8 +204,10 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) | |||
201 | status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, | 204 | status = acpi_ns_one_complete_parse(ACPI_IMODE_LOAD_PASS2, |
202 | table_index, start_node); | 205 | table_index, start_node); |
203 | if (ACPI_FAILURE(status)) { | 206 | if (ACPI_FAILURE(status)) { |
204 | return_ACPI_STATUS(status); | 207 | goto error_exit; |
205 | } | 208 | } |
206 | 209 | ||
210 | error_exit: | ||
211 | acpi_ex_exit_interpreter(); | ||
207 | return_ACPI_STATUS(status); | 212 | return_ACPI_STATUS(status); |
208 | } | 213 | } |