diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:15:19 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:15:19 +0300 |
| commit | 9695a9805284f09fefb5f8c53ba72d0c77748dbe (patch) | |
| tree | 8c26b7158f33d65be1b63762e4ce5992179476c9 /drivers/acpi/acpica/nsrepair.c | |
| parent | 0f57d86787d8b1076ea8f9cbdddda2a46d534a27 (diff) | |
| parent | f3b6ced236259a87829b829e8e542ff53bfb9a4f (diff) | |
| download | linux-9695a9805284f09fefb5f8c53ba72d0c77748dbe.tar.xz | |
Merge branch 'acpica'
* acpica: (22 commits)
ACPICA: Fix for ill-formed GUID strings for NFIT tables.
ACPICA: acpihelp: Update for new NFIT table GUIDs.
ACPICA: Update version to 20150515.
ACPICA: ACPI 6.0: Add support for NFIT table.
ACPICA: acpi_help: Add option to display all known/supported ACPI tables.
ACPICA: iASL/disassembler - fix possible fault for -e option.
ACPICA: ACPI 6.0: Add changes for DRTM table.
ACPICA: ACPI 6.0: Add support for IORT table.
ACPICA: ACPI 6.0: Add ACPI_SUB_PTR().
ACPICA: ACPI 6.0: Add changes for MADT table.
ACPICA: Hardware: Fix a resource leak issue in acpi_hw_build_pci_list().
ACPICA: Dispatcher: Fix a resource leak issue in acpi_ds_auto_serialize_method().
ACPICA: ACPI 6.0: Add changes for LPIT table.
ACPICA: ACPI 6.0: Add changes for FADT table.
ACPICA: ACPI 6.0: Add support for WPBT table.
ACPICA: iASL: Enhance detection of non-ascii or corrupted input files.
ACPICA: Parser: Move a couple externals to the proper header.
ACPICA: ACPI 6.0: Add support for XENV table.
ACPICA: ACPI 6.0: Add support for new predefined names.
ACPICA: ACPI 6.0: Add support for STAO table.
...
Diffstat (limited to 'drivers/acpi/acpica/nsrepair.c')
| -rw-r--r-- | drivers/acpi/acpica/nsrepair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c index 151fcd95ba84..77d8103d0094 100644 --- a/drivers/acpi/acpica/nsrepair.c +++ b/drivers/acpi/acpica/nsrepair.c @@ -497,10 +497,10 @@ acpi_ns_remove_null_elements(struct acpi_evaluate_info *info, case ACPI_PTYPE2_MIN: case ACPI_PTYPE2_REV_FIXED: case ACPI_PTYPE2_FIX_VAR: - break; default: + case ACPI_PTYPE2_VAR_VAR: case ACPI_PTYPE1_FIXED: case ACPI_PTYPE1_OPTION: return; |