projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
thermal_sys.c
diff --git
a/drivers/thermal/thermal_sys.c
b/drivers/thermal/thermal_sys.c
index d0b093b66adca7756300f1a47280e263af71e12f..5e38ba10a3a90ed2a35687c4e73d636e1626a817 100644
(file)
--- 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:
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);
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:
}
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;
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;
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:
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;
thermal_zone_device_passive(tz, temp,
trip_temp, count);
break;