Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-19 15:18:26 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-19 15:18:36 +0200
commita8ef02495d0b0bb373a80508f589e023c1c2c7e7 (patch)
treec9c59856bedf313694324e52abdf30d94c7e3247
parentc177bf5f29a16d66b25c77c2ec8c7d2e3e379f98 (diff)
drivers: thermal: tsens: Don't print error message on
-EPROBE_DEFER (bsc#1051510).
-rw-r--r--patches.fixes/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.fixes/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch b/patches.fixes/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
new file mode 100644
index 0000000000..d7f310ec64
--- /dev/null
+++ b/patches.fixes/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
@@ -0,0 +1,38 @@
+From fc7d18cf6a923cde7f5e7ba2c1105bb106d3e29a Mon Sep 17 00:00:00 2001
+From: Amit Kucheria <amit.kucheria@linaro.org>
+Date: Wed, 20 Mar 2019 18:47:52 +0530
+Subject: [PATCH] drivers: thermal: tsens: Don't print error message on -EPROBE_DEFER
+Git-commit: fc7d18cf6a923cde7f5e7ba2c1105bb106d3e29a
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+We print a calibration failure message on -EPROBE_DEFER from
+nvmem/qfprom as follows:
+[ 3.003090] qcom-tsens 4a9000.thermal-sensor: version: 1.4
+[ 3.005376] qcom-tsens 4a9000.thermal-sensor: tsens calibration failed
+[ 3.113248] qcom-tsens 4a9000.thermal-sensor: version: 1.4
+
+This confuses people when, in fact, calibration succeeds later when
+nvmem/qfprom device is available. Don't print this message on a
+-EPROBE_DEFER.
+
+Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
+Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/thermal/qcom/tsens.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/thermal/qcom/tsens.c
++++ b/drivers/thermal/qcom/tsens.c
+@@ -162,7 +162,8 @@ static int tsens_probe(struct platform_d
+ if (tmdev->ops->calibrate) {
+ ret = tmdev->ops->calibrate(tmdev);
+ if (ret < 0) {
+- dev_err(dev, "tsens calibration failed\n");
++ if (ret != -EPROBE_DEFER)
++ dev_err(dev, "tsens calibration failed\n");
+ return ret;
+ }
+ }
diff --git a/series.conf b/series.conf
index dea93ddf4b..5619594843 100644
--- a/series.conf
+++ b/series.conf
@@ -22467,6 +22467,7 @@
patches.drm/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch
patches.drm/drm-i915-fbc-disable-framebuffer-compression-on-Gemi.patch
patches.drm/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch
+ patches.fixes/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
patches.drivers/thermal-cpu_cooling-Actually-trace-CPU-load-in-therm.patch
patches.drivers/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch
patches.drivers/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch