diff options
author | Rafael J. Wysocki | 2014-01-05 15:55:34 +0100 |
---|---|---|
committer | Rafael J. Wysocki | 2014-01-05 15:55:34 +0100 |
commit | e73be4a78b500374a1c42810dc073189036b4dd8 (patch) | |
tree | 17b2e6481e68d95ff8b4a27931062c13f2621bd5 | |
parent | Linux 3.13-rc7 (diff) | |
parent | ACPI / TPM: fix memory leak when walking ACPI namespace (diff) | |
download | kernel-qcow2-linux-e73be4a78b500374a1c42810dc073189036b4dd8.tar.gz kernel-qcow2-linux-e73be4a78b500374a1c42810dc073189036b4dd8.tar.xz kernel-qcow2-linux-e73be4a78b500374a1c42810dc073189036b4dd8.zip |
Merge branch 'acpi-tpm' into acpi-dsm
-rw-r--r-- | drivers/char/tpm/tpm_ppi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c index 8e562dc65601..e1f3337a0cf9 100644 --- a/drivers/char/tpm/tpm_ppi.c +++ b/drivers/char/tpm/tpm_ppi.c @@ -27,15 +27,18 @@ static char *tpm_device_name = "TPM"; static acpi_status ppi_callback(acpi_handle handle, u32 level, void *context, void **return_value) { - acpi_status status; + acpi_status status = AE_OK; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer); - if (strstr(buffer.pointer, context) != NULL) { - *return_value = handle; + + if (ACPI_SUCCESS(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer))) { + if (strstr(buffer.pointer, context) != NULL) { + *return_value = handle; + status = AE_CTRL_TERMINATE; + } kfree(buffer.pointer); - return AE_CTRL_TERMINATE; } - return AE_OK; + + return status; } static inline void ppi_assign_params(union acpi_object params[4], |