From a020efa1fb95e8524fe93d3300c399f63e1b0dfc Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 12 Dec 2012 15:23:54 +0800 Subject: [PATCH] --- yaml --- r: 339290 b: refs/heads/master c: d567c686aebc7140f73318ee250236bda39c04eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/thermal/thermal_sys.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77f97f3c9b3a..f00a6faed4fd 100644 --- 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 index 8f0f37bb2825..8c8ce806180f 100644 --- 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,