aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/thermal.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/thermal.c')
-rw-r--r--drivers/acpi/thermal.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 263ec08a9011..f26c6463a09e 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -388,10 +388,12 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
388 } else if (crt > 0) { 388 } else if (crt > 0) {
389 unsigned long crt_k = CELSIUS_TO_KELVIN(crt); 389 unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
390 /* 390 /*
391 * Allow override to lower critical threshold 391 * Allow override critical threshold
392 */ 392 */
393 if (crt_k < tz->trips.critical.temperature) 393 if (crt_k > tz->trips.critical.temperature)
394 tz->trips.critical.temperature = crt_k; 394 printk(KERN_WARNING PREFIX
395 "Critical threshold %d C\n", crt);
396 tz->trips.critical.temperature = crt_k;
395 } 397 }
396 } 398 }
397 } 399 }
@@ -1647,7 +1649,7 @@ static int acpi_thermal_add(struct acpi_device *device)
1647 strcpy(tz->name, device->pnp.bus_id); 1649 strcpy(tz->name, device->pnp.bus_id);
1648 strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME); 1650 strcpy(acpi_device_name(device), ACPI_THERMAL_DEVICE_NAME);
1649 strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS); 1651 strcpy(acpi_device_class(device), ACPI_THERMAL_CLASS);
1650 acpi_driver_data(device) = tz; 1652 device->driver_data = tz;
1651 mutex_init(&tz->lock); 1653 mutex_init(&tz->lock);
1652 1654
1653 1655