diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-03-18 23:41:21 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-03-18 23:41:21 +0000 |
commit | fcbc97ad78f76de01964dd32dd4dcfa7f088d036 (patch) | |
tree | 529c90e30f06974d5671c6ac33c8a5238ce4e581 /target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch | |
parent | 6d933987db7be48d8b1637b32026ba0e6d8f27fa (diff) | |
download | upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.tar.gz upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.tar.bz2 upstream-fcbc97ad78f76de01964dd32dd4dcfa7f088d036.zip |
kernel: update kernel 4.1 to version 4.1.20
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 49035
Diffstat (limited to 'target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch')
-rw-r--r-- | target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch b/target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch index f4e237f369..7bdff55384 100644 --- a/target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch +++ b/target/linux/mediatek/patches/0012-thermal-remove-useless-call-to-thermal_zone_device_s.patch @@ -17,13 +17,13 @@ Acked-by: Eduardo Valentin <edubezval@gmail.com> --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c -@@ -1571,9 +1571,6 @@ struct thermal_zone_device *thermal_zone +@@ -1601,9 +1601,6 @@ struct thermal_zone_device *thermal_zone INIT_DELAYED_WORK(&(tz->poll_queue), thermal_zone_device_check); - if (!tz->ops->get_temp) - thermal_zone_device_set_polling(tz, 0); - - thermal_zone_device_update(tz); - - return tz; + thermal_zone_device_reset(tz); + /* Update the new thermal zone and mark it as already updated. */ + if (atomic_cmpxchg(&tz->need_update, 1, 0)) |