diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-21 12:06:47 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-21 12:06:47 +0800 |
| commit | 1b29aa698d3ef8826599dc856054640eb71d2e33 (patch) | |
| tree | b29f220c6fccc16facef485973e5dc00d5fea9aa /drivers/firmware | |
| parent | 51f34b615fa526142825db2aa26927be91cf14ca (diff) | |
| parent | 96c00ece76be83d99dc7f66fd15e5641524791cf (diff) | |
Merge tag 'v4.4.107' into linux-linaro-lsk-v4.4
This is the 4.4.107 stable release
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 1 | ||||
| -rw-r--r-- | drivers/firmware/efi/esrt.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 78fe416126d1..ef467ae6dc40 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -310,7 +310,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) early_memunmap(md, sizeof (*md)); } - pr_err_once("requested map not found.\n"); return -ENOENT; } diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index 0ca4c34f9441..341b8c686ec7 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -253,7 +253,7 @@ void __init efi_esrt_init(void) rc = efi_mem_desc_lookup(efi.esrt, &md); if (rc < 0) { - pr_err("ESRT header is not in the memory map.\n"); + pr_warn("ESRT header is not in the memory map.\n"); return; } |