diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-26 10:29:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-26 10:29:54 +0100 |
| commit | 713608a30b0a5f5b0866a7c4f462e51b362ee06d (patch) | |
| tree | b244dbb0703b7a2bc968d76c6c186a84e5a12499 /drivers/firmware/efi | |
| parent | b4447c0dcd0d270e98a88e34df52cb097acd0fd2 (diff) | |
| parent | c7ccf10bb92e68d8eb09f1b9635df7fbce0190d9 (diff) | |
| download | linux-713608a30b0a5f5b0866a7c4f462e51b362ee06d.tar.bz2 | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20191018
ACPICA: debugger: remove leading whitespaces when converting a string to a buffer
ACPICA: acpiexec: initialize all simple types and field units from user input
ACPICA: debugger: add field unit support for acpi_db_get_next_token
ACPICA: debugger: surround field unit output with braces '{'
ACPICA: debugger: add command to dump all fields of particular subtype
ACPICA: utilities: add flag to only display data when dumping buffers
ACPICA: make acpi_load_table() return table index
ACPICA: Add new external interface, acpi_unload_table()
ACPICA: More Clang changes
ACPICA: Win OSL: Replace get_tick_count with get_tick_count64
ACPICA: Results from Clang
Diffstat (limited to 'drivers/firmware/efi')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index e98bbf8e56d9..8a492ce16b3b 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -296,7 +296,7 @@ static __init int efivar_ssdt_load(void) goto free_data; } - ret = acpi_load_table(data); + ret = acpi_load_table(data, NULL); if (ret) { pr_err("failed to load table: %d\n", ret); goto free_data; |