---

yaml --- r: 298044 b: refs/heads/master c: 9bcb811 h: refs/heads/master v: v3
git-mirror · Mar 30, 2012 · 3042472 · 3042472
1 parent c55d9ea
commit 3042472
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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;