Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d15076 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ac' and 'acpi-tpm' 

* acpi-ac:
  ACPI / AC: change notification handler type to ACPI_ALL_NOTIFY

* acpi-tpm:
  ACPI / TPM: fix memory leak when walking ACPI namespace
parents 50a2bc54 df45c712

drivers/char/tpm/tpm_ppi.c

+9 −6
Original line number Diff line number Diff line
@@ -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 (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],