diff options
Diffstat (limited to 'drivers/acpi/namespace/nseval.c')
| -rw-r--r-- | drivers/acpi/namespace/nseval.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c index 26fd0dd6953d..97b2ac57c16b 100644 --- a/drivers/acpi/namespace/nseval.c +++ b/drivers/acpi/namespace/nseval.c | |||
| @@ -75,7 +75,7 @@ ACPI_MODULE_NAME("nseval") | |||
| 75 | * MUTEX: Locks interpreter | 75 | * MUTEX: Locks interpreter |
| 76 | * | 76 | * |
| 77 | ******************************************************************************/ | 77 | ******************************************************************************/ |
| 78 | acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) | 78 | acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info) |
| 79 | { | 79 | { |
| 80 | acpi_status status; | 80 | acpi_status status; |
| 81 | 81 | ||
| @@ -154,11 +154,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) | |||
| 154 | * Execute the method via the interpreter. The interpreter is locked | 154 | * Execute the method via the interpreter. The interpreter is locked |
| 155 | * here before calling into the AML parser | 155 | * here before calling into the AML parser |
| 156 | */ | 156 | */ |
| 157 | status = acpi_ex_enter_interpreter(); | 157 | acpi_ex_enter_interpreter(); |
| 158 | if (ACPI_FAILURE(status)) { | ||
| 159 | return_ACPI_STATUS(status); | ||
| 160 | } | ||
| 161 | |||
| 162 | status = acpi_ps_execute_method(info); | 158 | status = acpi_ps_execute_method(info); |
| 163 | acpi_ex_exit_interpreter(); | 159 | acpi_ex_exit_interpreter(); |
| 164 | } else { | 160 | } else { |
| @@ -182,10 +178,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info) | |||
| 182 | * resolution, we must lock it because we could access an opregion. | 178 | * resolution, we must lock it because we could access an opregion. |
| 183 | * The opregion access code assumes that the interpreter is locked. | 179 | * The opregion access code assumes that the interpreter is locked. |
| 184 | */ | 180 | */ |
| 185 | status = acpi_ex_enter_interpreter(); | 181 | acpi_ex_enter_interpreter(); |
| 186 | if (ACPI_FAILURE(status)) { | ||
| 187 | return_ACPI_STATUS(status); | ||
| 188 | } | ||
| 189 | 182 | ||
| 190 | /* Function has a strange interface */ | 183 | /* Function has a strange interface */ |
| 191 | 184 | ||
