UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge back int340x thermal driver changes for v5.18.

This commit is contained in:
Rafael J. Wysocki 2022-02-28 20:46:53 +01:00
parent 3abea10e6a 098c874e20
commit ec52cd3fa1
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
View File

@ -72,7 +72,6 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
int i; int i;
int nr_bad_entries = 0; int nr_bad_entries = 0;
struct trt *trts; struct trt *trts;
struct acpi_device *adev;
union acpi_object *p; union acpi_object *p;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer element = { 0, 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) if (!create_dev)
continue; continue;
result = acpi_bus_get_device(trt->source, &adev); if (!acpi_fetch_acpi_dev(trt->source))
if (result)
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
result = acpi_bus_get_device(trt->target, &adev); if (!acpi_fetch_acpi_dev(trt->target))
if (result)
pr_warn("Failed to get target ACPI device\n"); 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 i;
int nr_bad_entries = 0; int nr_bad_entries = 0;
struct art *arts; struct art *arts;
struct acpi_device *adev;
union acpi_object *p; union acpi_object *p;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer element = { 0, NULL }; struct acpi_buffer element = { 0, NULL };
@ -191,16 +187,11 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
if (!create_dev) if (!create_dev)
continue; continue;
if (art->source) { if (!acpi_fetch_acpi_dev(art->source))
result = acpi_bus_get_device(art->source, &adev); pr_warn("Failed to get source ACPI device\n");
if (result)
pr_warn("Failed to get source ACPI device\n"); if (!acpi_fetch_acpi_dev(art->target))
} pr_warn("Failed to get target ACPI device\n");
if (art->target) {
result = acpi_bus_get_device(art->target, &adev);
if (result)
pr_warn("Failed to get target ACPI device\n");
}
} }
*artp = arts; *artp = arts;

5
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
View File

@ -468,6 +468,11 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer, priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer,
obj->package.elements[0].buffer.length, obj->package.elements[0].buffer.length,
GFP_KERNEL); GFP_KERNEL);
if (!priv->data_vault) {
kfree(buffer.pointer);
return;
}
bin_attr_data_vault.private = priv->data_vault; bin_attr_data_vault.private = priv->data_vault;
bin_attr_data_vault.size = obj->package.elements[0].buffer.length; bin_attr_data_vault.size = obj->package.elements[0].buffer.length;
kfree(buffer.pointer); kfree(buffer.pointer);