1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 310e40ab00b6..663c2fdba775 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -241,6 +241,8 @@ passive_store(struct device *dev, struct device_attribute *attr,
                                                                  cdev);
                 }
                 mutex_unlock(&thermal_list_lock);
+                if (!tz->passive_delay)
+                        tz->passive_delay = 1000;
         } else if (!state && tz->forced_passive) {
                 mutex_lock(&thermal_list_lock);
                 list_for_each_entry(cdev, &thermal_cdev_list, node) {
@@ -251,17 +253,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
                                                                    cdev);
                 }
                 mutex_unlock(&thermal_list_lock);
+                tz->passive_delay = 0;
         }
 
         tz->tc1 = 1;
         tz->tc2 = 1;
 
-        if (!tz->passive_delay)
-                tz->passive_delay = 1000;
-
-        if (!tz->polling_delay)
-                tz->polling_delay = 10000;
-
         tz->forced_passive = state;
 
         thermal_zone_device_update(tz);