@@ -1497,9 +1497,24 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
/* Unbind all cdevs associated with 'this' thermal zone */
list_for_each_entry(cdev, &thermal_cdev_list, node) {
+ struct thermal_instance *ti;
+
+ mutex_lock(&tz->lock);
+ list_for_each_entry(ti, &tz->thermal_instances, tz_node) {
+ if (ti->cdev == cdev) {
+ mutex_unlock(&tz->lock);
+ goto unbind;
+ }
+ }
+
+ /* The cooling device is not bound to current thermal zone */
+ mutex_unlock(&tz->lock);
+ continue;
+
+unbind:
if (tz->ops->unbind) {
tz->ops->unbind(tz, cdev);
- continue;
+ goto deactivate;
}
if (!tzp || !tzp->tbp)
@@ -1511,6 +1526,16 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
tzp->tbp[i].cdev = NULL;
}
}
+
+deactivate:
+ /*
+ * The thermal instances for current thermal zone has been
+ * removed. Update the cooling device in case it is activated
+ * by current thermal zone device.
+ */
+ mutex_lock(&cdev->lock);
+ __thermal_cdev_update(cdev);
+ mutex_unlock(&cdev->lock);
}
mutex_unlock(&thermal_list_lock);
When unregistering a thermal zone device, update all cooling devices bound to the thermal zone device. This fixes a problem that the frequency of ACPI processors are still limited after unloading ACPI thermal driver while ACPI passive cooling is activated. Cc: stable@vger.kernel.org Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- v1 -> v2 Changelog update. Rearrange the code to elimiate an "iterator used outside loop" warning. --- drivers/thermal/thermal_core.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)