From 5030614cb38614c1891291c9554a7738c2ef72b0 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Mon, 26 Oct 2009 08:39:04 +0100
Subject: [PATCH] --- yaml --- r: 177538 b: refs/heads/master c:
 3767cb54ac718eb049d2a29f7a575ab923550ba5 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/thermal/thermal_sys.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 445623ebf79d..ed74f37c14e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4143b0324a6a468cb00c4341cd20d60cc441252
+refs/heads/master: 3767cb54ac718eb049d2a29f7a575ab923550ba5
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c
index 663c2fdba775..3bc72ea57e09 100644
--- a/trunk/drivers/thermal/thermal_sys.c
+++ b/trunk/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);