Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio

[cascardo/linux.git] / drivers / thermal / thermal_core.c

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 43b9070..84fdf07 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -368,7 +368,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
        tz->ops->get_trip_temp(tz, trip, &trip_temp);
 
        /* If we have not crossed the trip_temp, we do not care. */
-       if (tz->temperature < trip_temp)
+       if (trip_temp <= 0 || tz->temperature < trip_temp)
                return;
 
        trace_thermal_zone_trip(tz, trip, trip_type);
@@ -757,6 +757,7 @@ policy_store(struct device *dev, struct device_attribute *attr,
        snprintf(name, sizeof(name), "%s", buf);
 
        mutex_lock(&thermal_governor_lock);
+       mutex_lock(&tz->lock);
 
        gov = __find_governor(strim(name));
        if (!gov)
@@ -766,6 +767,7 @@ policy_store(struct device *dev, struct device_attribute *attr,
        ret = count;
 
 exit:
+       mutex_unlock(&tz->lock);
        mutex_unlock(&thermal_governor_lock);
        return ret;
 }
@@ -1835,10 +1837,10 @@ static int __init thermal_init(void)
 
 exit_netlink:
        genetlink_exit();
-unregister_governors:
-       thermal_unregister_governors();
 unregister_class:
        class_unregister(&thermal_class);
+unregister_governors:
+       thermal_unregister_governors();
 error:
        idr_destroy(&thermal_tz_idr);
        idr_destroy(&thermal_cdev_idr);