diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2012-10-31 02:26:36 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 00:31:25 +0100 |
| commit | 267d672ab3e2b171230b3edb5711794fab0afb02 (patch) | |
| tree | 051af2621fd3c6d6581b272fa53609ee051d03b2 /drivers/acpi/acpica/nsaccess.c | |
| parent | 691fda505822e46e2a8106e33b408a12e11732bc (diff) | |
| download | linux-stable-267d672ab3e2b171230b3edb5711794fab0afb02.tar.gz linux-stable-267d672ab3e2b171230b3edb5711794fab0afb02.tar.bz2 linux-stable-267d672ab3e2b171230b3edb5711794fab0afb02.zip | |
ACPICA: Fix for predefined name loop during ACPICA initialization
If a name cannot be created, simply continue on to the next name.
Do not attempt to use the name, do not abort. With assistance
from Colin Ian King.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/nsaccess.c')
| -rw-r--r-- | drivers/acpi/acpica/nsaccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c index fc168e62c1c9..d70eaf39dfdf 100644 --- a/drivers/acpi/acpica/nsaccess.c +++ b/drivers/acpi/acpica/nsaccess.c @@ -110,11 +110,11 @@ acpi_status acpi_ns_root_initialize(void) status = acpi_ns_lookup(NULL, init_val->name, init_val->type, ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, NULL, &new_node); - - if (ACPI_FAILURE(status) || (!new_node)) { /* Must be on same line for code converter */ + if (ACPI_FAILURE(status)) { ACPI_EXCEPTION((AE_INFO, status, "Could not create predefined name %s", init_val->name)); + continue; } /* |