Merge ~chunsang/avila/+git/kernel-3.10:power_consumption/fix-bt-thermal into ~phablet-team/avila/+git/kernel-3.10:ubuntu

[Chunsang Jeong]

Fix bt thermal polling watermark which previously had wrong value to check
bt thermal for ever and thus invoked unnecessary kworker even while sleeping.

Unmerged commits

53c6533... by Chunsang Jeong on 2016-04-26

Fix bt thermal polling watermark which previously had wrong value to check
bt thermal for ever and thus invoked unnecessary kworker even while sleeping.

Signed-off-by: Chunsang Jeong <email address hidden>

diff --git a/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c b/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
index f7149e2..d69342e 100644
--- a/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
+++ b/drivers/misc/mediatek/thermal/mt8163/mtk_ts_bts.c
@@ -23,7 +23,7 @@ extern struct proc_dir_entry * mtk_thermal_get_proc_drv_therm_dir_entry(void);
 static unsigned int interval = 0; /* seconds, 0 : no auto polling */
 static int trip_temp[10] = {120000,110000,100000,90000,80000,70000,65000,60000,55000,50000};
 static struct thermal_zone_device *thz_dev;
-static int mtkts_bts_debug_log = 1;
+static int mtkts_bts_debug_log = 0;
 static int kernelmode = 0;
 static int g_THERMAL_TRIP[10] = {0,0,0,0,0,0,0,0,0,0};
 static int num_trip=0;
@@ -553,7 +553,7 @@ int mtkts_bts_get_hw_temp(void)
     //get HW AP temp (TSAP)
     //cat /sys/class/power_supply/AP/AP_temp
 	t_ret = get_hw_bts_temp();
-	t_ret = t_ret * 1000;
+	t_ret = t_ret * 100;
 
 	mutex_unlock(&BTS_lock);