diff options
| author | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-09-30 21:38:43 +0900 |
|---|---|---|
| committer | Seung-Woo Kim <sw0312.kim@samsung.com> | 2016-12-14 13:48:07 +0900 |
| commit | 58663ead2f4b8ff4c5d90acc76f63a483e7d689d (patch) | |
| tree | 687c18f896d555e4585b673798d5cbc3a8482944 /drivers/thermal | |
| parent | 0ff6c12daa2549e08f7389bc4e2290a09d05cfed (diff) | |
Revert "Correct backport of fa3c776 ("Thermal: Ignore invalid trip points")"
This reverts commit 5640c4c37eee293451388cd5ee74dfed3a30f32d.
In this tree, the commit 17e8351a7739 ("thermal: consistently use
int for temperatures") is already backported, so this patch should
be reverted.
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/thermal_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index d3b67f4a4bd2..1dac120f72e9 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1489,7 +1489,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, { struct thermal_zone_device *tz; enum thermal_trip_type trip_type; - unsigned long trip_temp; + int trip_temp; int result; int count; int passive = 0; |