From 1bfa6095f06ae8bc98314bfbc5b4b20ed374d54e Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 27 Sep 2012 16:20:38 +0530
Subject: [PATCH] --- yaml --- r: 334223 b: refs/heads/master c:
 c072fed95c9855a920c114d7fa3351f0f54ea06e h: refs/heads/master i:   334221:
 c4a34cf86c8c0163e4f79f888b0bbb13b51e0916   334219:
 e23c70fb43c0e8d9cbf9d464e8e9e141ee666053   334215:
 cf5ad70dbbdddb13f1e6c27aa1c6021df60e0028   334207:
 dca97206597ad2709e5a47360777cd699f52373c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/thermal/exynos_thermal.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4b4200a47eb7..9d2d2e37da17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4b6fec977020a508ff04b05f0fa01221a4ecf29
+refs/heads/master: c072fed95c9855a920c114d7fa3351f0f54ea06e
diff --git a/trunk/drivers/thermal/exynos_thermal.c b/trunk/drivers/thermal/exynos_thermal.c
index e84acde9e0bf..fd03e8581afc 100644
--- a/trunk/drivers/thermal/exynos_thermal.c
+++ b/trunk/drivers/thermal/exynos_thermal.c
@@ -475,11 +475,14 @@ static void exynos_unregister_thermal(void)
 {
 	int i;
 
-	if (th_zone && th_zone->therm_dev)
+	if (!th_zone)
+		return;
+
+	if (th_zone->therm_dev)
 		thermal_zone_device_unregister(th_zone->therm_dev);
 
 	for (i = 0; i < th_zone->cool_dev_size; i++) {
-		if (th_zone && th_zone->cool_dev[i])
+		if (th_zone->cool_dev[i])
 			cpufreq_cooling_unregister(th_zone->cool_dev[i]);
 	}