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

Merge back int340x thermal driver changes for v5.18.

parents 3abea10e 098c874e

drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c

+7 −16
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp, 
	int i;

	int nr_bad_entries = 0;

	struct trt *trts;

	struct acpi_device *adev;

	union acpi_object *p;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer element = { 0, NULL };
@@ -112,12 +111,10 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp, 
		if (!create_dev)

			continue;



		result = acpi_bus_get_device(trt->source, &adev);

		if (result)

		if (!acpi_fetch_acpi_dev(trt->source))

			pr_warn("Failed to get source ACPI device\n");



		result = acpi_bus_get_device(trt->target, &adev);

		if (result)

		if (!acpi_fetch_acpi_dev(trt->target))

			pr_warn("Failed to get target ACPI device\n");

	}
@@ -149,7 +146,6 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp, 
	int i;

	int nr_bad_entries = 0;

	struct art *arts;

	struct acpi_device *adev;

	union acpi_object *p;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_buffer element = { 0, NULL };
@@ -191,17 +187,12 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp, 
		if (!create_dev)

			continue;



		if (art->source) {

			result = acpi_bus_get_device(art->source, &adev);

			if (result)

		if (!acpi_fetch_acpi_dev(art->source))

			pr_warn("Failed to get source ACPI device\n");

		}

		if (art->target) {

			result = acpi_bus_get_device(art->target, &adev);

			if (result)



		if (!acpi_fetch_acpi_dev(art->target))

			pr_warn("Failed to get target ACPI device\n");

	}

	}



	*artp = arts;

	/* don't count bad entries */

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+5 −0
Original line number Diff line number Diff line
@@ -468,6 +468,11 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv) 
	priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,

				   obj->package.elements[0].buffer.length,

				   GFP_KERNEL);

	if (!priv->data_vault) {

		kfree(buffer.pointer);

		return;

	}



	bin_attr_data_vault.private = priv->data_vault;

	bin_attr_data_vault.size = obj->package.elements[0].buffer.length;

	kfree(buffer.pointer);