diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-17 17:13:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-17 17:13:18 +0100 |
| commit | e1342f1da06d39b3bbd530e9306347c4438bc6e5 (patch) | |
| tree | 3d8d70c1e633d9bd5b929ad27b8123faa7789b84 /drivers/thermal/thermal_sys.c | |
| parent | 776abac81764847338a6a02c34609d4b8dfb4918 (diff) | |
| parent | ee348d5a1d810bc9958cabb7c27302aab235d36e (diff) | |
| download | blackbird-op-linux-e1342f1da06d39b3bbd530e9306347c4438bc6e5.tar.gz blackbird-op-linux-e1342f1da06d39b3bbd530e9306347c4438bc6e5.zip | |
Merge branch 'smp-fix'
Diffstat (limited to 'drivers/thermal/thermal_sys.c')
| -rw-r--r-- | drivers/thermal/thermal_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index d0b093b66adc..5e38ba10a3a9 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -961,7 +961,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) switch (trip_type) { case THERMAL_TRIP_CRITICAL: - if (temp > trip_temp) { + if (temp >= trip_temp) { if (tz->ops->notify) ret = tz->ops->notify(tz, count, trip_type); @@ -974,7 +974,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) } break; case THERMAL_TRIP_HOT: - if (temp > trip_temp) + if (temp >= trip_temp) if (tz->ops->notify) tz->ops->notify(tz, count, trip_type); break; @@ -986,14 +986,14 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) cdev = instance->cdev; - if (temp > trip_temp) + if (temp >= trip_temp) cdev->ops->set_cur_state(cdev, 1); else cdev->ops->set_cur_state(cdev, 0); } break; case THERMAL_TRIP_PASSIVE: - if (temp > trip_temp || tz->passive) + if (temp >= trip_temp || tz->passive) thermal_zone_device_passive(tz, temp, trip_temp, count); break; |
