leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: thermal fixup

Browse Source 
The alias name may be used in _PSL, _ALx and _TZD,
so we bind the cooling device only if the acpi_device node matches.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Thomas Sujith <sujith.thomas@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui 2008-01-17 15:51:18 +08:00 committed by Len Brown
parent cc0573b325
commit 653a00c966
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/acpi/thermal.c
View File

@ -1015,7 +1015,9 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
{ {
struct acpi_device *device = cdev->devdata; struct acpi_device *device = cdev->devdata;
struct acpi_thermal *tz = thermal->devdata; struct acpi_thermal *tz = thermal->devdata;
acpi_handle handle = device->handle; struct acpi_device *dev;
acpi_status status;
acpi_handle handle;
int i; int i;
int j; int j;
int trip = -1; int trip = -1;
@ -1031,12 +1033,13 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
trip++; trip++;
for (i = 0; i < tz->trips.passive.devices.count; for (i = 0; i < tz->trips.passive.devices.count;
i++) { i++) {
if (tz->trips.passive.devices.handles[i] != handle = tz->trips.passive.devices.handles[i];
handle) status = acpi_bus_get_device(handle, &dev);
continue; if (ACPI_SUCCESS(status) && (dev == device)) {
result = action(thermal, trip, cdev); result = action(thermal, trip, cdev);
if (result) if (result)
goto failed; goto failed;
}
} }
} }
@ -1047,21 +1050,24 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
for (j = 0; for (j = 0;
j < tz->trips.active[i].devices.count; j < tz->trips.active[i].devices.count;
j++) { j++) {
if (tz->trips.active[i].devices. handle = tz->trips.active[i].devices.handles[j];
handles[j] != handle) status = acpi_bus_get_device(handle, &dev);
continue; if (ACPI_SUCCESS(status) && (dev == device)) {
result = action(thermal, trip, cdev); result = action(thermal, trip, cdev);
if (result) if (result)
goto failed; goto failed;
}
} }
} }
for (i = 0; i < tz->devices.count; i++) { for (i = 0; i < tz->devices.count; i++) {
if (tz->devices.handles[i] != handle) handle = tz->devices.handles[i];
continue; status = acpi_bus_get_device(handle, &dev);
result = action(thermal, -1, cdev); if (ACPI_SUCCESS(status) && (dev == device)) {
if (result) result = action(thermal, -1, cdev);
goto failed; if (result)
goto failed;
}
} }
failed: failed: