FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 08:53:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Browse Source 
Pull thermal management fixes from Zhang Rui:
 "Specifics:

   - Fix a problem that Intel SoC DTS thermal driver does not work when
     CONFIG_THERMAL_INT340X is not set.

   - Fix a NULL pointer dereference when processor_thermal_device driver
     is loaded on a platform without ACPI support"

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  int340x_thermal/processor_thermal_device: return failure when
  ACPI/int340x_thermal: enumerate INT3401 for Intel SoC DTS thermal driver
  ACPI/int340x_thermal: enumerate INT340X devices even if they're not in _ART/_TRT
This commit is contained in:
Linus Torvalds 2015-01-14 07:53:51 +13:00
commit 4f7a42deff
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/acpi/int340x_thermal.c
View File

@ -14,10 +14,10 @@
#include "internal.h" #include "internal.h"
#define DO_ENUMERATION 0x01 #define INT3401_DEVICE 0X01
static const struct acpi_device_id int340x_thermal_device_ids[] = { static const struct acpi_device_id int340x_thermal_device_ids[] = {
{"INT3400", DO_ENUMERATION }, {"INT3400"},
{"INT3401"}, {"INT3401", INT3401_DEVICE},
{"INT3402"}, {"INT3402"},
{"INT3403"}, {"INT3403"},
{"INT3404"}, {"INT3404"},
@ -34,7 +34,10 @@ static int int340x_thermal_handler_attach(struct acpi_device *adev,
const struct acpi_device_id *id) const struct acpi_device_id *id)
{ {
#if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE) #if defined(CONFIG_INT340X_THERMAL) || defined(CONFIG_INT340X_THERMAL_MODULE)
if (id->driver_data == DO_ENUMERATION) acpi_create_platform_device(adev);
#elif defined(INTEL_SOC_DTS_THERMAL) || defined(INTEL_SOC_DTS_THERMAL_MODULE)
/* Intel SoC DTS thermal driver needs INT3401 to set IRQ descriptor */
if (id->driver_data == INT3401_DEVICE)
acpi_create_platform_device(adev); acpi_create_platform_device(adev);
#endif #endif
return 1; return 1;

16
drivers/thermal/int340x_thermal/acpi_thermal_rel.c
View File

@ -119,15 +119,11 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
continue; continue;
result = acpi_bus_get_device(trt->source, &adev); result = acpi_bus_get_device(trt->source, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
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); result = acpi_bus_get_device(trt->target, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get target ACPI device\n"); pr_warn("Failed to get target ACPI device\n");
} }
@ -206,16 +202,12 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
if (art->source) { if (art->source) {
result = acpi_bus_get_device(art->source, &adev); result = acpi_bus_get_device(art->source, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
} }
if (art->target) { if (art->target) {
result = acpi_bus_get_device(art->target, &adev); result = acpi_bus_get_device(art->target, &adev);
if (!result) if (result)
acpi_create_platform_device(adev);
else
pr_warn("Failed to get source ACPI device\n"); pr_warn("Failed to get source ACPI device\n");
} }
} }

2
drivers/thermal/int340x_thermal/processor_thermal_device.c
View File

@ -130,6 +130,8 @@ static int proc_thermal_add(struct device *dev,
int ret; int ret;
adev = ACPI_COMPANION(dev); adev = ACPI_COMPANION(dev);
if (!adev)
return -ENODEV;
status = acpi_evaluate_object(adev->handle, "PPCC", NULL, &buf); status = acpi_evaluate_object(adev->handle, "PPCC", NULL, &buf);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))