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]);
 	}