diff options
author | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-04-02 07:03:25 -0400 |
commit | d312d9831f25a8e70d64df46fb2fe9aab2e8c939 (patch) | |
tree | 9afa8b258222e66221f8239d8ad51372d63c5ac3 /arch/x86/lib/acpi_nhlt.c | |
parent | 25049ad560826f7dc1c4740883b0016014a59789 (diff) | |
parent | bc39e06778168a34bb4e0a34fbee4edbde4414d8 (diff) |
Merge branch 'next'
Merge in all changes from the next branch now that the release is out.
Diffstat (limited to 'arch/x86/lib/acpi_nhlt.c')
-rw-r--r-- | arch/x86/lib/acpi_nhlt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c index 6c8cd83e12d..08e13fdea67 100644 --- a/arch/x86/lib/acpi_nhlt.c +++ b/arch/x86/lib/acpi_nhlt.c @@ -409,7 +409,7 @@ int nhlt_serialise_oem_overrides(struct acpi_ctx *ctx, struct nhlt *nhlt, memcpy(header->oem_table_id, oem_table_id, oem_table_id_len); } header->oem_revision = oem_revision; - memcpy(header->aslc_id, ASLC_ID, 4); + memcpy(header->creator_id, ASLC_ID, 4); cur.buf = (void *)(header + 1); cur.start = (void *)header; |