diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2024-06-04 20:31:03 +0300 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2024-06-04 20:31:03 +0300 |
| commit | 290be0a40276ca36a5110b191d73a71b8bbe466f (patch) | |
| tree | 0012ce88ff5e8256644cebe1f520636a43a46aba /drivers | |
| parent | c3f38fa61af77b49866b006939479069cd451173 (diff) | |
| parent | 7c23b186ab892088f76a3ad9dbff1685ffe2e832 (diff) | |
| download | linux-290be0a40276ca36a5110b191d73a71b8bbe466f.tar.xz | |
Merge branch 'efi/next' into efi/urgent
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/efi-pstore.c | 8 | ||||
| -rw-r--r-- | drivers/firmware/efi/libstub/zboot.lds | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index 5b9dc26e6bcb..552c78f5f059 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -136,7 +136,7 @@ static int efi_pstore_read_func(struct pstore_record *record, &size, record->buf); if (status != EFI_SUCCESS) { kfree(record->buf); - return -EIO; + return efi_status_to_err(status); } /* @@ -189,7 +189,7 @@ static ssize_t efi_pstore_read(struct pstore_record *record) return 0; if (status != EFI_SUCCESS) - return -EIO; + return efi_status_to_err(status); /* skip variables that don't concern us */ if (efi_guidcmp(guid, LINUX_EFI_CRASH_GUID)) @@ -227,7 +227,7 @@ static int efi_pstore_write(struct pstore_record *record) record->size, record->psi->buf, true); efivar_unlock(); - return status == EFI_SUCCESS ? 0 : -EIO; + return efi_status_to_err(status); }; static int efi_pstore_erase(struct pstore_record *record) @@ -238,7 +238,7 @@ static int efi_pstore_erase(struct pstore_record *record) PSTORE_EFI_ATTRIBUTES, 0, NULL); if (status != EFI_SUCCESS && status != EFI_NOT_FOUND) - return -EIO; + return efi_status_to_err(status); return 0; } diff --git a/drivers/firmware/efi/libstub/zboot.lds b/drivers/firmware/efi/libstub/zboot.lds index ac8c0ef85158..af2c82f7bd90 100644 --- a/drivers/firmware/efi/libstub/zboot.lds +++ b/drivers/firmware/efi/libstub/zboot.lds @@ -41,6 +41,7 @@ SECTIONS } /DISCARD/ : { + *(.discard .discard.*) *(.modinfo .init.modinfo) } } |