From 3042472c5d9eb71d05e62d17e06b445d29763985 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 1 Feb 2012 10:26:54 -0500 Subject: [PATCH] --- yaml --- r: 298044 b: refs/heads/master c: 9bcb8118965ab4631a65ee0726e6518f75cda6c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/thermal.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 44f1ccf9d662..e4abeb7a63a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1f0e2ac596f531c15b7b09ebeb8cfd011fffbd2 +refs/heads/master: 9bcb8118965ab4631a65ee0726e6518f75cda6c5 diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c index 48fbc647b178..7dbebea1ec31 100644 --- a/trunk/drivers/acpi/thermal.c +++ b/trunk/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;