diff options
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
| -rw-r--r-- | drivers/acpi/acpica/dswload.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index 843942fb4be5..845ff44919c3 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c | |||
| @@ -315,10 +315,19 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, | |||
| 315 | flags = ACPI_NS_NO_UPSEARCH; | 315 | flags = ACPI_NS_NO_UPSEARCH; |
| 316 | if ((walk_state->opcode != AML_SCOPE_OP) && | 316 | if ((walk_state->opcode != AML_SCOPE_OP) && |
| 317 | (!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) { | 317 | (!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) { |
| 318 | flags |= ACPI_NS_ERROR_IF_FOUND; | 318 | if (walk_state->namespace_override) { |
| 319 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, | 319 | flags |= ACPI_NS_OVERRIDE_IF_FOUND; |
| 320 | "[%s] Cannot already exist\n", | 320 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, |
| 321 | acpi_ut_get_type_name(object_type))); | 321 | "[%s] Override allowed\n", |
| 322 | acpi_ut_get_type_name | ||
| 323 | (object_type))); | ||
| 324 | } else { | ||
| 325 | flags |= ACPI_NS_ERROR_IF_FOUND; | ||
| 326 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, | ||
| 327 | "[%s] Cannot already exist\n", | ||
| 328 | acpi_ut_get_type_name | ||
| 329 | (object_type))); | ||
| 330 | } | ||
| 322 | } else { | 331 | } else { |
| 323 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, | 332 | ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, |
| 324 | "[%s] Both Find or Create allowed\n", | 333 | "[%s] Both Find or Create allowed\n", |