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/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.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/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch')
| -rw-r--r-- | target/linux/mediatek/patches/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch b/target/linux/mediatek/patches/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch index 65c76c3a26..5a4c1da2b1 100644 --- a/target/linux/mediatek/patches/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch +++ b/target/linux/mediatek/patches/0017-thermal-Allow-sensor-ops-to-fail-with-ENOSYS.patch @@ -22,7 +22,7 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c -@@ -413,13 +413,16 @@ static void handle_thermal_trip(struct t +@@ -416,13 +416,16 @@ static void handle_thermal_trip(struct t */ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) { @@ -42,7 +42,7 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> mutex_lock(&tz->lock); -@@ -445,7 +448,7 @@ int thermal_zone_get_temp(struct thermal +@@ -448,7 +451,7 @@ int thermal_zone_get_temp(struct thermal } mutex_unlock(&tz->lock); @@ -51,9 +51,9 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> return ret; } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); -@@ -454,10 +457,11 @@ void thermal_zone_device_update(struct t - { - int temp, ret, count; +@@ -460,10 +463,11 @@ void thermal_zone_device_update(struct t + if (atomic_read(&in_suspend)) + return; - if (!tz->ops->get_temp) + ret = thermal_zone_get_temp(tz, &temp); @@ -65,7 +65,7 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> if (ret) { if (ret != -EAGAIN) dev_warn(&tz->device, -@@ -783,10 +787,16 @@ emul_temp_store(struct device *dev, stru +@@ -803,10 +807,16 @@ emul_temp_store(struct device *dev, stru if (kstrtoul(buf, 10, &temperature)) return -EINVAL; |