1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 663c2fdba775..3bc72ea57e09 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1019,6 +1019,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
                 thermal_zone_device_set_polling(tz, tz->passive_delay);
         else if (tz->polling_delay)
                 thermal_zone_device_set_polling(tz, tz->polling_delay);
+        else
+                thermal_zone_device_set_polling(tz, 0);
         mutex_unlock(&tz->lock);
 }
 EXPORT_SYMBOL(thermal_zone_device_update);