---

yaml --- r: 339290 b: refs/heads/master c: d567c68 h: refs/heads/master v: v3
git-mirror · Dec 12, 2012 · a020efa · a020efa
1 parent 7fa07a6
commit a020efa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12250ef8dc1bbc811d505776be053e358ba82f5
+refs/heads/master: d567c686aebc7140f73318ee250236bda39c04eb
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c
@@ -336,7 +336,8 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
 static void handle_non_critical_trips(struct thermal_zone_device *tz,
 			int trip, enum thermal_trip_type trip_type)
 {
-	tz->governor->throttle(tz, trip);
+	if (tz->governor)
+		tz->governor->throttle(tz, trip);
 }
 
 static void handle_critical_trips(struct thermal_zone_device *tz,