Merge branch '4.3-fixes' into mips-for-linux-next

[linux-drm-fsl-dcu.git] / drivers / thermal / fair_share.c

diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c
index c2c10bbe24d62c7cef116cf3c1ac2a9e5f738905..34fe36504a552cdaf112a6982483655f25dc2238 100644 (file)
--- a/drivers/thermal/fair_share.c
+++ b/drivers/thermal/fair_share.c
@@ -34,7 +34,7 @@
 static int get_trip_level(struct thermal_zone_device *tz)
 {
        int count = 0;
-       unsigned long trip_temp;
+       int trip_temp;
        enum thermal_trip_type trip_type;
 
        if (tz->trips == 0 || !tz->ops->get_trip_temp)