ACPI: Evaluate thermal trip points before reading temperature

An HP laptop (Pavilion G4-1016tx) has the following code in _TMP:

       Store (\_SB.PCI0.LPCB.EC0.RTMP, Local0)
       If (LGreaterEqual (Local0, S4TP))
       {
           Store (One, HTS4)
       }

S4TP is initialised at 0 and not programmed further until either _HOT or
_CRT is called. If we evaluate _TMP before the trip points then HTS4 will
always be set, causing the firmware to generate a message on boot
complaining that the system shut down because of overheating. The simplest
solution is just to reverse the checking of trip points and _TMP in thermal
init.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 48fbc647b17..7dbebea1ec3 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -941,13 +941,13 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
         if (!tz)
                 return -EINVAL;
 
-        /* Get temperature [_TMP] (required) */
-        result = acpi_thermal_get_temperature(tz);
+        /* Get trip points [_CRT, _PSV, etc.] (required) */
+        result = acpi_thermal_get_trip_points(tz);
         if (result)
                 return result;
 
-        /* Get trip points [_CRT, _PSV, etc.] (required) */
-        result = acpi_thermal_get_trip_points(tz);
+        /* Get temperature [_TMP] (required) */
+        result = acpi_thermal_get_temperature(tz);
         if (result)
                 return result;