diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /drivers/thermal/thermal_sys.c | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
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) | |||
| 961 | 961 | ||
| 962 | switch (trip_type) { | 962 | switch (trip_type) { |
| 963 | case THERMAL_TRIP_CRITICAL: | 963 | case THERMAL_TRIP_CRITICAL: |
| 964 | if (temp > trip_temp) { | 964 | if (temp >= trip_temp) { |
| 965 | if (tz->ops->notify) | 965 | if (tz->ops->notify) |
| 966 | ret = tz->ops->notify(tz, count, | 966 | ret = tz->ops->notify(tz, count, |
| 967 | trip_type); | 967 | trip_type); |
| @@ -974,7 +974,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) | |||
| 974 | } | 974 | } |
| 975 | break; | 975 | break; |
| 976 | case THERMAL_TRIP_HOT: | 976 | case THERMAL_TRIP_HOT: |
| 977 | if (temp > trip_temp) | 977 | if (temp >= trip_temp) |
| 978 | if (tz->ops->notify) | 978 | if (tz->ops->notify) |
| 979 | tz->ops->notify(tz, count, trip_type); | 979 | tz->ops->notify(tz, count, trip_type); |
| 980 | break; | 980 | break; |
| @@ -986,14 +986,14 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) | |||
| 986 | 986 | ||
| 987 | cdev = instance->cdev; | 987 | cdev = instance->cdev; |
| 988 | 988 | ||
| 989 | if (temp > trip_temp) | 989 | if (temp >= trip_temp) |
| 990 | cdev->ops->set_cur_state(cdev, 1); | 990 | cdev->ops->set_cur_state(cdev, 1); |
| 991 | else | 991 | else |
| 992 | cdev->ops->set_cur_state(cdev, 0); | 992 | cdev->ops->set_cur_state(cdev, 0); |
| 993 | } | 993 | } |
| 994 | break; | 994 | break; |
| 995 | case THERMAL_TRIP_PASSIVE: | 995 | case THERMAL_TRIP_PASSIVE: |
| 996 | if (temp > trip_temp || tz->passive) | 996 | if (temp >= trip_temp || tz->passive) |
| 997 | thermal_zone_device_passive(tz, temp, | 997 | thermal_zone_device_passive(tz, temp, |
| 998 | trip_temp, count); | 998 | trip_temp, count); |
| 999 | break; | 999 | break; |