1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index c4e00ac8ea85..782c2250443e 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -884,10 +884,15 @@ static void acpi_thermal_check(void *data)
 static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf)
 {
         struct acpi_thermal *tz = thermal->devdata;
+        int result;
 
         if (!tz)
                 return -EINVAL;
 
+        result = acpi_thermal_get_temperature(tz);
+        if (result)
+                return result;
+
         return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(tz->temperature));
 }
 
@@ -1012,6 +1017,18 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal,
         return -EINVAL;
 }
 
+static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
+                                unsigned long *temperature) {
+        struct acpi_thermal *tz = thermal->devdata;
+
+        if (tz->trips.critical.flags.valid) {
+                *temperature = KELVIN_TO_MILLICELSIUS(
+                                tz->trips.critical.temperature);
+                return 0;
+        } else
+                return -EINVAL;
+}
+
 typedef int (*cb)(struct thermal_zone_device *, int,
                   struct thermal_cooling_device *);
 static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
@@ -1103,6 +1120,7 @@ static struct thermal_zone_device_ops acpi_thermal_zone_ops = {
         .set_mode = thermal_set_mode,
         .get_trip_type = thermal_get_trip_type,
         .get_trip_temp = thermal_get_trip_temp,
+        .get_crit_temp = thermal_get_crit_temp,
 };
 
 static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
@@ -1123,9 +1141,9 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
 
         for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&
                         tz->trips.active[i].flags.valid; i++, trips++);
-        tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
+        tz->thermal_zone = thermal_zone_device_register("acpitz",
                                         trips, tz, &acpi_thermal_zone_ops);
-        if (!tz->thermal_zone)
+        if (IS_ERR(tz->thermal_zone))
                 return -ENODEV;
 
         result = sysfs_create_link(&tz->device->dev.kobj,
@@ -1710,7 +1728,6 @@ static int acpi_thermal_resume(struct acpi_device *device)
         return AE_OK;
 }
 
-#ifdef CONFIG_DMI
 static int thermal_act(const struct dmi_system_id *d) {
 
         if (act == 0) {
@@ -1785,7 +1802,6 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
         },
         {}
 };
-#endif /* CONFIG_DMI */
 
 static int __init acpi_thermal_init(void)
 {