Merge branch 'bugfix-thermal' into release

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 713b7ea4a60709e89e164fd4765e75e5397ed57f..fc6f2a5bde01324675424b01da941e8718ccd259 100644 (file)
--- 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);