diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:07:19 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:07:19 -0700 |
| commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
| tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/acpi/acpica/tbxfload.c | |
| parent | 1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (diff) | |
| parent | 6ca7208569550de43d64db6cf873706c371284a5 (diff) | |
| download | linux-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.bz2 | |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/acpica/tbxfload.c')
| -rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index 3151968c10d1..ac71abcd32bb 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -82,7 +82,7 @@ acpi_status __init acpi_load_tables(void) * their customized default region handlers. */ status = acpi_ev_install_region_handlers(); - if (ACPI_FAILURE(status) && status != AE_ALREADY_EXISTS) { + if (ACPI_FAILURE(status)) { ACPI_EXCEPTION((AE_INFO, status, "During Region initialization")); return_ACPI_STATUS(status); |