Merge branch 'bugfix-thermal' into release
This commit is contained in:
commit
797b10a070
1 changed files with 2 additions and 1 deletions
|
@ -560,7 +560,8 @@ thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
|
||||||
|
|
||||||
tz->hwmon = NULL;
|
tz->hwmon = NULL;
|
||||||
device_remove_file(hwmon->device, &tz->temp_input.attr);
|
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);
|
mutex_lock(&thermal_list_lock);
|
||||||
list_del(&tz->hwmon_node);
|
list_del(&tz->hwmon_node);
|
||||||
|
|
Loading…
Add table
Reference in a new issue