From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 2 Sep 2015 02:08:02 +0000 (+0800)
Subject: Merge branches 'thermal-core' and 'thermal-intel' of .git into next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5a924a07f882e866f2337bf65048be357956691a;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'thermal-core' and 'thermal-intel' of .git into next
---

5a924a07f882e866f2337bf65048be357956691a
diff --cc drivers/thermal/power_allocator.c
index 251676902869,045aea59ce9d,4672250b329f..9c8a7aad0252
--- a/drivers/thermal/power_allocator.c
+++ b/drivers/thermal/power_allocator.c
@@@@ -331,9 -326,9 -326,9 +331,9 @@@@ static int allocate_power(struct therma
   				      granted_power, total_granted_power,
   				      num_actors, power_range,
   				      max_allocatable_power, current_temp,
- -				      (s32)control_temp - (s32)current_temp);
+ +				      control_temp - current_temp);
   
 --	devm_kfree(&tz->device, req_power);
 ++	kfree(req_power);
   unlock:
   	mutex_unlock(&tz->lock);