1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 39fc8124741c..6590bb5cb688 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -451,16 +451,20 @@ static void update_temperature(struct thermal_zone_device *tz)
                         tz->last_temperature, tz->temperature);
 }
 
-static void thermal_zone_device_reset(struct thermal_zone_device *tz)
+static void thermal_zone_device_init(struct thermal_zone_device *tz)
 {
         struct thermal_instance *pos;
-
         tz->temperature = THERMAL_TEMP_INVALID;
-        tz->passive = 0;
         list_for_each_entry(pos, &tz->thermal_instances, tz_node)
                 pos->initialized = false;
 }
 
+static void thermal_zone_device_reset(struct thermal_zone_device *tz)
+{
+        tz->passive = 0;
+        thermal_zone_device_init(tz);
+}
+
 void thermal_zone_device_update(struct thermal_zone_device *tz,
                                 enum thermal_notify_event event)
 {
@@ -1502,7 +1506,7 @@ static int thermal_pm_notify(struct notifier_block *nb,
         case PM_POST_SUSPEND:
                 atomic_set(&in_suspend, 0);
                 list_for_each_entry(tz, &thermal_tz_list, node) {
-                        thermal_zone_device_reset(tz);
+                        thermal_zone_device_init(tz);
                         thermal_zone_device_update(tz,
                                                    THERMAL_EVENT_UNSPECIFIED);
                 }