---

yaml --- r: 95520 b: refs/heads/master c: 76ecb4f h: refs/heads/master v: v3
git-mirror · Apr 29, 2008 · b947b56 · b947b56
1 parent a5edd2f
commit b947b56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9030062f3d61f87c1e787b3aa134fa3a8e4b2d25
+refs/heads/master: 76ecb4f2d7ea5c3aac8970b9529775316507c6d2
diff --git a/trunk/drivers/acpi/thermal.c b/trunk/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));
 }