diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-11-12 12:38:04 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-11-12 12:38:04 +0300 |
| commit | 5ca9d3a4286a1a4aaa46acc7c1c29a15d8d0fea2 (patch) | |
| tree | 9976cdcae28e0e6d189cbe831696415429fbe3e9 /drivers/char/tpm/tpm_of.c | |
| parent | 5d50ac70fe98518dbf620bfba8184254663125eb (diff) | |
| parent | d56e4f75346933dd2cb11533a668ce883908c859 (diff) | |
| download | linux-5ca9d3a4286a1a4aaa46acc7c1c29a15d8d0fea2.tar.xz | |
Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for-linus
Diffstat (limited to 'drivers/char/tpm/tpm_of.c')
| -rw-r--r-- | drivers/char/tpm/tpm_of.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index 1141456a4b1f..570f30c5c5f4 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -53,17 +53,18 @@ int read_log(struct tpm_bios_log *log) goto cleanup_eio; } - of_node_put(np); log->bios_event_log = kmalloc(*sizep, GFP_KERNEL); if (!log->bios_event_log) { pr_err("%s: ERROR - Not enough memory for BIOS measurements\n", __func__); + of_node_put(np); return -ENOMEM; } log->bios_event_log_end = log->bios_event_log + *sizep; memcpy(log->bios_event_log, __va(*basep), *sizep); + of_node_put(np); return 0; |