Merge branch 'bugfix-thermal' into release

git-mirror · Mar 23, 2011 · 797b10a · 797b10a
2 parents 8a9026d + 4fdfbe8
commit 797b10a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
@@ -560,7 +560,8 @@ thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
 
 	tz->hwmon = NULL;
 	device_remove_file(hwmon->device, &tz->temp_input.attr);
-	device_remove_file(hwmon->device, &tz->temp_crit.attr);
+	if (tz->ops->get_crit_temp)
+		device_remove_file(hwmon->device, &tz->temp_crit.attr);
 
 	mutex_lock(&thermal_list_lock);
 	list_del(&tz->hwmon_node);