summaryrefslogtreecommitdiffstats
path: root/drivers/firmware/efi
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2018-03-24 13:39:18 +0100
committerWolfram Sang <wsa@the-dreams.de>2018-03-24 13:39:18 +0100
commit0b884c22c5b7f6ef985b3d39fed06ad1f8296042 (patch)
tree74504e80ad62cb0acabdfa796348d001d5d1a2a4 /drivers/firmware/efi
parenteb49778c8c6cbe075cf90d741ccf16f674a8db4e (diff)
parent84e10623c0b9c81557918804f309d66aec86a233 (diff)
downloadop-kernel-dev-0b884c22c5b7f6ef985b3d39fed06ad1f8296042.zip
op-kernel-dev-0b884c22c5b7f6ef985b3d39fed06ad1f8296042.tar.gz
Merge tag 'at24-4.17-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.17
"three new special cases for device tree compatible strings"
Diffstat (limited to 'drivers/firmware/efi')
-rw-r--r--drivers/firmware/efi/libstub/tpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/libstub/tpm.c b/drivers/firmware/efi/libstub/tpm.c
index da661bf..13c1edd 100644
--- a/drivers/firmware/efi/libstub/tpm.c
+++ b/drivers/firmware/efi/libstub/tpm.c
@@ -68,11 +68,11 @@ void efi_retrieve_tpm2_eventlog_1_2(efi_system_table_t *sys_table_arg)
efi_guid_t linux_eventlog_guid = LINUX_EFI_TPM_EVENT_LOG_GUID;
efi_status_t status;
efi_physical_addr_t log_location, log_last_entry;
- struct linux_efi_tpm_eventlog *log_tbl;
+ struct linux_efi_tpm_eventlog *log_tbl = NULL;
unsigned long first_entry_addr, last_entry_addr;
size_t log_size, last_entry_size;
efi_bool_t truncated;
- void *tcg2_protocol;
+ void *tcg2_protocol = NULL;
status = efi_call_early(locate_protocol, &tcg2_guid, NULL,
&tcg2_protocol);
OpenPOWER on IntegriCloud